[Pkg-owncloud-commits] [owncloud-client] 02/12: Merge tag 'upstream/2.1.1_rc2+dfsg'

[Sandro Knauß]

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

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

commit 1867979847afe7bbe8034b9658e57b2778aaa5fe
Merge: d7bf8e9 a768ce5
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 8 18:14:01 2016 +0100

    Merge tag 'upstream/2.1.1_rc2+dfsg'
    
    Upstream version 2.1.1~rc2+dfsg
    
    # gpg: Unterschrift vom Mo 08 Feb 2016 18:13:57 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                           |   2 +-
 ChangeLog                                      |   6 +-
 VERSION.cmake                                  |   2 +-
 csync/src/csync_update.c                       |  55 ++++++++++--
 doc/building.rst                               | 115 ++++++++++++-------------
 doc/conf.py.in                                 |   2 +
 shell_integration/nautilus/createnemoplugin.sh |   6 ++
 src/gui/folderwatcher_mac.cpp                  |   2 +-
 src/libsync/CMakeLists.txt                     |   7 +-
 src/libsync/accessmanager.cpp                  |   4 -
 src/libsync/creds/httpcredentials.cpp          |   1 -
 src/libsync/creds/tokencredentials.cpp         |   8 +-
 src/libsync/creds/tokencredentials.h           |   3 +-
 src/libsync/discoveryphase.cpp                 |   3 -
 translations/client_de.ts                      |   2 +-
 translations/client_fr.ts                      |  10 +--
 translations/client_ja.ts                      |   4 +-
 translations/client_ru.ts                      |   2 +-
 18 files changed, 144 insertions(+), 90 deletions(-)

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