Merge pull request #5934 from owncloud/stable5-excludeextstoragefromquota

author Vincent Petry <pvince81@owncloud.com>

Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)

committer Vincent Petry <pvince81@owncloud.com>

Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)
author Vincent Petry <pvince81@owncloud.com>
Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)
committer Vincent Petry <pvince81@owncloud.com>
Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)
diff --cc lib/files/view.php
Simple merge
diff --cc tests/lib/files/view.php
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)
committer	Vincent Petry <pvince81@owncloud.com>
	Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)
		1	2
lib/files/view.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/files/view.php	patch \|	diff1 \|	diff2 \|	blob \| history