Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
authorJörn Friedrich Dreyer <jfd@butonic.de>
Sat, 25 Aug 2012 01:14:26 +0000 (03:14 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Sat, 25 Aug 2012 01:14:26 +0000 (03:14 +0200)
commit4f5eff2b6fd60f603a8704cb950acff67c5cc9f3
tree7706c477a9e119835f5ba97d861c2ed1997cc463
parentdc3bec62113b39254c4488b0502d7852328fdc84
parentf57d527a7ce10a0ed48e25d7e2432dae2ec9366a
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
apps/calendar/l10n/ru.php
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/el.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/it.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/sl.php
apps/files/l10n/nl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/zh_CN.php