Merge pull request #12218 from owncloud/issue/10991-fixes

author Morris Jobke <hey@morrisjobke.de>

Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)

committer Morris Jobke <hey@morrisjobke.de>

Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)
author Morris Jobke <hey@morrisjobke.de>
Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)
committer Morris Jobke <hey@morrisjobke.de>
Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)
diff --cc apps/files_encryption/lib/stream.php
Simple merge
diff --cc tests/lib/app.php
Simple merge
diff --cc tests/lib/files/view.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)
committer	Morris Jobke <hey@morrisjobke.de>
	Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)
		1	2
apps/files_encryption/lib/stream.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/app.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/files/view.php	patch \|	diff1 \|	diff2 \|	blob \| history