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
..
adminrecovery.php	Added ajax scripts for setting pwd recovery preferences	2013-03-28 18:29:18 +01:00
userrecovery.php	Added ajax scripts for setting pwd recovery preferences	2013-03-28 18:29:18 +01:00