# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410362725 -7200
# Node ID e5f5432c829d3b0f73a9fd08e2495571fd01882d
# Parent  0b8a18521ef0fa9c178a4e3d50819d8471a09668# Parent  bd4fe3c48274e75ac0e27946342a32b8501025aa
Merged upstream changes.

diff -r 0b8a18521ef0 -r e5f5432c829d debian/changelog
--- a/debian/changelog	Wed Aug 06 18:00:01 2014 +0200
+++ b/debian/changelog	Wed Sep 10 17:25:25 2014 +0200
@@ -1,3 +1,35 @@
+pykolab (0.7.1-0~kolab4) unstable; urgency=low
+
+  * Added patch to use conf.socketfile in kolab-saslauthd
+
+ -- Aeneas Jaissle <aj@ajaissle.de>  Tue, 26 Aug 2014 23:17:00 +0200
+
+pykolab (0.7.1-0~kolab3) unstable; urgency=low
+
+  * Fix the chwala URL
+  * Add kolab_tags to plugins
+  * Use more secure URLs
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 20 Aug 2014 01:49:00 +0100
+
+pykolab (0.7.1-0~kolab1) unstable; urgency=low
+
+  * Upstream release of version 0.7.1
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 19 Aug 2014 01:49:00 +0100
+
+pykolab (0.7.0-0~kolab1) unstable; urgency=low
+
+  * Upstream release of version 0.7.0
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 14 Aug 2014 01:49:00 +0100
+
+pykolab (0.7~dev20140625-0~kolab1) unstable; urgency=low
+
+  * git master head snapshot
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 25 Jun 2014 01:49:00 +0100
+
 pykolab (0.6.13-0~kolab1) unstable; urgency=low
 
   * Correct more permission errors
diff -r 0b8a18521ef0 -r e5f5432c829d debian/kolab-cli.install
diff -r 0b8a18521ef0 -r e5f5432c829d debian/pykolab.install