Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php		2013-03-28 18:39:12 +01:00
..
hooks.php	Merge branch 'master' into files_encryption	2013-03-28 18:39:12 +01:00