[Pkg-owncloud-commits] [owncloud-client] 08/08: Merge tag 'upstream/1.6.0+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 2533963b6378011562a0e1fa88eaf5a583be71a4
Merge: aae0fbd 2f68a12
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Jun 2 23:52:00 2014 +0200

    Merge tag 'upstream/1.6.0+dfsg'
    
    Upstream version 1.6.0+dfsg
    
    # gpg: Unterschrift vom Mo 02 Jun 2014 23:51:53 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                |  2 +-
 src/creds/shibbolethcredentials.cpp | 13 +++++++++++++
 src/creds/shibbolethcredentials.h   |  1 +
 src/mirall/owncloudpropagator.cpp   |  2 +-
 translations/mirall_el.ts           |  6 +++---
 translations/mirall_es.ts           | 22 +++++++++++-----------
 translations/mirall_fr.ts           |  8 ++++----
 translations/mirall_pt_BR.ts        | 28 ++++++++++++++--------------
 translations/mirall_tr.ts           |  2 +-
 9 files changed, 49 insertions(+), 35 deletions(-)

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