4655 commits

Author	SHA1	Message	Date
Georg Ehrke	4c2cf35050	fix merge conflicts	2012-04-22 13:19:12 +02:00
Georg Ehrke	711aa229b8	Merge branch 'master' into movable_apps	2012-04-20 22:41:39 +02:00
Georg Ehrke	c3d78cf77a	remove require once lib base in files scan.php	2012-04-20 22:34:13 +02:00
Georg Ehrke	b44bc9f4b2	remove require once lib base in some more files	2012-04-18 17:42:11 +02:00
Georg Ehrke	45de7ad221	move files to app folder	2012-04-18 17:27:34 +02:00