[Pkg-owncloud-commits] [owncloud-client] 08/12: Merge branch 'master' into experimental

[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 485e56100477565af1471a6517e60e732bd8c38a
Merge: 40a84ff 196d8fe
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Feb 16 01:27:21 2016 +0100

    Merge branch 'master' into experimental

 .tag                                           | 2 +-
 ChangeLog                                      | 2 +-
 VERSION.cmake                                  | 2 +-
 debian/changelog                               | 4 ++--
 shell_integration/nautilus/createnemoplugin.sh | 2 +-
 shell_integration/nautilus/setappname.sh       | 2 +-
 translations/client_ca.ts                      | 2 +-
 translations/client_cs.ts                      | 2 +-
 translations/client_de.ts                      | 2 +-
 translations/client_el.ts                      | 2 +-
 translations/client_en.ts                      | 2 +-
 translations/client_es.ts                      | 2 +-
 translations/client_es_AR.ts                   | 2 +-
 translations/client_et.ts                      | 2 +-
 translations/client_eu.ts                      | 4 ++--
 translations/client_fa.ts                      | 2 +-
 translations/client_fi.ts                      | 2 +-
 translations/client_fr.ts                      | 4 ++--
 translations/client_gl.ts                      | 2 +-
 translations/client_hu.ts                      | 2 +-
 translations/client_it.ts                      | 2 +-
 translations/client_ja.ts                      | 2 +-
 translations/client_nb_NO.ts                   | 2 +-
 translations/client_nl.ts                      | 2 +-
 translations/client_pl.ts                      | 2 +-
 translations/client_pt.ts                      | 2 +-
 translations/client_pt_BR.ts                   | 2 +-
 translations/client_ru.ts                      | 2 +-
 translations/client_sk.ts                      | 2 +-
 translations/client_sl.ts                      | 2 +-
 translations/client_sr.ts                      | 2 +-
 translations/client_sv.ts                      | 2 +-
 translations/client_th.ts                      | 2 +-
 translations/client_tr.ts                      | 2 +-
 translations/client_uk.ts                      | 2 +-
 translations/client_zh_CN.ts                   | 2 +-
 translations/client_zh_TW.ts                   | 2 +-
 37 files changed, 40 insertions(+), 40 deletions(-)

diff --cc debian/changelog
index e59a939,a8ca4fa..29ae190
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,14 -2,8 +2,14 @@@ owncloud-client (2.1.1+dfsg-0) UNRELEAS
  
    * New upstream release.
  
-  -- Sandro Knauß <bugs at sandroknauss.de>  Mon, 08 Feb 2016 18:14:19 +0100
+  -- Sandro Knauß <bugs at sandroknauss.de>  Wed, 10 Feb 2016 23:56:03 +0100
  
 +owncloud-client (2.1.0+dfsg-2) experimental; urgency=medium
 +
 +  * Add dolphin plugin.
 +
 + -- Sandro Knauß <bugs at sandroknauss.de>  Sun, 24 Jan 2016 02:32:02 +0100
 +
  owncloud-client (2.1.0+dfsg-1) unstable; urgency=medium
  
    * New upstream release.

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