Merge pull request #8435 from owncloud/fix-8322-master

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

Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)

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

Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)
diff --cc apps/files/lib/helper.php
Simple merge
diff --cc lib/private/connector/sabre/filesplugin.php
Simple merge
diff --cc lib/private/files/fileinfo.php
Simple merge
diff --cc lib/public/files/fileinfo.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)
		1	2
apps/files/lib/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/connector/sabre/filesplugin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/files/fileinfo.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/public/files/fileinfo.php	patch \|	diff1 \|	diff2 \|	blob \| history