Sam Tuke 3b9e2f1bab Merge branch 'master' into files_encryption-style-fixes ... Conflicts: apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php		2013-02-05 18:43:55 +00:00
..
crypt.php	Merge branch 'master' into files_encryption-style-fixes	2013-02-05 18:43:55 +00:00
keymanager.php	Merge branch 'master' into files_encryption-style-fixes	2013-02-05 18:43:55 +00:00
proxy.php	Fixed incompatibilities with filecache rewrite merge	2013-01-31 16:49:07 +00:00
session.php	Fixed comment typo, wrapped return value conditional on var assignment in session{}	2013-02-05 17:28:26 +00:00
stream.php	Fixed comment typo, wrapped return value conditional on var assignment in session{}	2013-02-05 17:28:26 +00:00
util.php	Merge branch 'master' into files_encryption-style-fixes	2013-02-05 18:43:55 +00:00