Merge branch 'master' into improve_app-management

author kondou <kondou@ts.unde.re>

Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)

committer kondou <kondou@ts.unde.re>

Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
author kondou <kondou@ts.unde.re>
Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
committer kondou <kondou@ts.unde.re>
Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
diff --cc core/css/styles.css
Simple merge
diff --cc lib/app.php
Simple merge
diff --cc lib/installer.php
Simple merge
author	kondou <kondou@ts.unde.re>
	Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
committer	kondou <kondou@ts.unde.re>
	Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
		1	2
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
lib/app.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/installer.php	patch \|	diff1 \|	diff2 \|	blob \| history