Sam Tuke 8b01286a5d Merged branch 'master'		2012-10-16 16:57:07 +01:00
..
core.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
files.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
files_encryption.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
files_external.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
files_sharing.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
files_versions.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
lib.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
settings.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00
user_ldap.pot	Merged branch 'master'	2012-10-16 16:57:07 +01:00