Merge branch 'master' of https://github.com/owncloud/core into last_cron_log

author kondou <kondou@ts.unde.re>

Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)

committer kondou <kondou@ts.unde.re>

Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
author kondou <kondou@ts.unde.re>
Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
committer kondou <kondou@ts.unde.re>
Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
diff --cc cron.php
Simple merge
diff --cc settings/admin.php
Simple merge
diff --cc settings/templates/admin.php
Simple merge
author	kondou <kondou@ts.unde.re>
	Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
committer	kondou <kondou@ts.unde.re>
	Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
		1	2
cron.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/templates/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history