[Pkg-owncloud-commits] [owncloud-client] 01/05: 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 baba474e78dcf95fd76901ff68db1fb41db66429
Merge: 57a9ad7 98f2ba6
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Feb 20 09:07:24 2016 +0100

    Merge branch 'master' into experimental

 debian/changelog | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d4a7f26,7750723..bb7b5d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,18 @@@
- owncloud-client (2.1.1+dfsg-0) UNRELEASED; urgency=medium
++owncloud-client (2.1.1+dfsg-2~) UNRELEASED; urgency=medium
 +
-   * New upstream release.
 +  * Added dolphin plugin.
 +  * Added nemo plugin.
 +  * Added owncloud-client-data for shared data between different packages.
 +
 + -- Sandro Knauß <bugs at sandroknauss.de>  Wed, 10 Feb 2016 23:56:03 +0100
 +
+ owncloud-client (2.1.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Updated patch hunks
+ 
+  -- Sandro Knauß <bugs at sandroknauss.de>  Wed, 17 Feb 2016 11:00:56 +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