Merge branch 'master' into files_encryption_upgrade_fix

author Björn Schießle <schiessle@owncloud.com>

Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)

committer Björn Schießle <schiessle@owncloud.com>

Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
author Björn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
committer Björn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
diff --cc apps/files_encryption/hooks/hooks.php
Simple merge
diff --cc apps/files_encryption/lib/util.php
Simple merge
diff --cc apps/files_encryption/tests/util.php
Simple merge
author	Björn Schießle <schiessle@owncloud.com>
	Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
committer	Björn Schießle <schiessle@owncloud.com>
	Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
		1	2
apps/files_encryption/hooks/hooks.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_encryption/lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_encryption/tests/util.php	patch \|	diff1 \|	diff2 \|	blob \| history