Merge branch 'master' into files_encryption_upgrade_fix

author Florin Peter <github@florin-peter.de>

Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)

committer Florin Peter <github@florin-peter.de>

Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
author Florin Peter <github@florin-peter.de>
Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
committer Florin Peter <github@florin-peter.de>
Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
diff --cc apps/files_encryption/hooks/hooks.php
Simple merge
diff --cc apps/files_encryption/lib/proxy.php
Simple merge
diff --cc apps/files_encryption/lib/util.php
Simple merge
author	Florin Peter <github@florin-peter.de>
	Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
committer	Florin Peter <github@florin-peter.de>
	Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
		1	2
apps/files_encryption/hooks/hooks.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_encryption/lib/proxy.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_encryption/lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history