Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support

apps/admin_dependencies_chk/l10n/ru.php

apps/admin_migrate/l10n/nl.php

apps/admin_migrate/l10n/ru.php

apps/bookmarks/l10n/nl.php

apps/bookmarks/l10n/ru.php

apps/bookmarks/l10n/zh_CN.php

apps/calendar/l10n/nl.php

apps/calendar/l10n/ru.php

apps/contacts/l10n/ca.php

apps/contacts/l10n/cs_CZ.php

apps/contacts/l10n/de.php

apps/contacts/l10n/el.php

apps/contacts/l10n/fr.php

apps/contacts/l10n/it.php

apps/contacts/l10n/ja_JP.php

apps/contacts/l10n/nl.php

apps/contacts/l10n/ru.php

apps/contacts/l10n/sl.php

apps/contacts/l10n/sv.php

apps/files/l10n/nl.php