[Pkg-owncloud-commits] [owncloud-client] 192/484: Merge remote-tracking branch 'origin/2.0'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 6aa26654f6847f1fea4601e4ec33b175a97c331a
Merge: 0fde7f0 4d7fde5
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Oct 29 12:44:28 2015 +0100

    Merge remote-tracking branch 'origin/2.0'

 ChangeLog                    |   6 +-
 src/cmd/cmd.cpp              |   4 +-
 translations/client_fr.ts    |   4 +-
 translations/client_ja.ts    |  70 +++++-----
 translations/client_zh_TW.ts | 321 ++++++++++++++++++++++---------------------
 5 files changed, 209 insertions(+), 196 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git