Merge pull request #7107 from owncloud/load-apps-proper-master

author Thomas Müller <thomas.mueller@tmit.eu>

Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)
diff --cc cron.php
Simple merge
diff --cc lib/base.php
Simple merge
diff --cc lib/private/util.php
Simple merge
diff --cc settings/admin.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)
		1	2
cron.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/util.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history