[Pkg-owncloud-commits] [owncloud-client] 11/14: Merge tag 'upstream/1.8.1_rc2+dfsg'

[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 c9689c4b3ebccd33188c483e806a45068c4b8ca2
Merge: 81702e1 283cba6
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed May 6 23:25:21 2015 +0200

    Merge tag 'upstream/1.8.1_rc2+dfsg'
    
    Upstream version 1.8.1~rc2+dfsg
    
    # gpg: Unterschrift vom Mi 06 Mai 2015 23:25:15 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                          |  2 +-
 VERSION.cmake                 |  2 +-
 src/libsync/clientproxy.cpp   |  1 +
 src/libsync/syncengine.cpp    |  9 ++++-
 src/libsync/syncjournaldb.cpp | 16 +++++++++
 src/libsync/syncjournaldb.h   |  2 ++
 translations/client_ca.ts     | 37 ++++++++++----------
 translations/client_de.ts     | 54 ++++++++++++++---------------
 translations/client_es.ts     | 20 +++++------
 translations/client_ja.ts     | 28 +++++++--------
 translations/client_ru.ts     |  2 ++
 translations/client_sr.ts     |  6 ++--
 translations/client_tr.ts     | 80 +++++++++++++++++++++----------------------
 13 files changed, 144 insertions(+), 115 deletions(-)

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