[Pkg-owncloud-commits] [owncloud-client] 07/08: Imported Upstream version 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 2f68a1295b604f9cddec591b74a7eb8c83ed3289
Merge: 1b83fb0 746c15b
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Jun 2 23:51:35 2014 +0200

    Imported Upstream version 1.6.0+dfsg

 .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(-)

diff --cc .tag
index 5004504,6828f88..b8de0c8
--- a/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 022a3fcd923ec49a980b2a867751a7176390aaa3
 -$Format:%H$
++746c15b4aa5f1b80ee1aec3b5cee1c29eb311e5c

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