Merge pull request #5773 from owncloud/fix-2152-master

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

Thu, 21 Nov 2013 16:03:21 +0000 (08:03 -0800)

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

Thu, 21 Nov 2013 16:03:21 +0000 (08:03 -0800)
author Thomas Müller <thomas.mueller@tmit.eu>
Thu, 21 Nov 2013 16:03:21 +0000 (08:03 -0800)
committer Thomas Müller <thomas.mueller@tmit.eu>
Thu, 21 Nov 2013 16:03:21 +0000 (08:03 -0800)
diff --cc lib/base.php
Simple merge
diff --cc lib/private/util.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 21 Nov 2013 16:03:21 +0000 (08:03 -0800)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 21 Nov 2013 16:03:21 +0000 (08:03 -0800)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/util.php	patch \|	diff1 \|	diff2 \|	blob \| history