# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1408227140 -7200
# Node ID 7a421ca5f0cb1f4a93bdebd35fa224c4e504d5f1
# Parent  cda8936a4c64ecad0806cb9bf738111d30b74eae# Parent  a3d19da608336d71fe16de245b5da37cd92f5f01
Merged upstream changes.

diff -r cda8936a4c64 -r 7a421ca5f0cb debian/changelog
--- a/debian/changelog	Sun Feb 23 14:11:24 2014 +0100
+++ b/debian/changelog	Sun Aug 17 00:12:20 2014 +0200
@@ -1,3 +1,36 @@
+kolab (3.1.8-1) unstable; urgency=low
+
+  * Fix logo location and introduce the use of asset paths
+  * Set Kolab SMTP Access Policy to on by default, now that
+    we ship a version of Postfix that can handle it.
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 13 Jul 2014 12:56:00 +0100
+
+kolab (3.1.4-1) unstable; urgency=low
+
+  * Refresh the configuration for kolab-mta on UCS
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  2 May 2014 12:56:00 +0100
+
+kolab (3.1.2-1) unstable; urgency=low
+
+  * Adjust kolab.pref and ensure $HOME is set for webclient join script
+  * Also ensure $USER is set, and export both $USER and $HOME
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  7 Mar 2014 12:56:00 +0100
+
+kolab (3.1.0-38) unstable; urgency=low
+
+  * Drop kolab.list from apt sources
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  6 Mar 2014 12:56:00 +0100
+
+kolab (3.1.0-37) unstable; urgency=low
+
+  * Set USER and GROUP for the init.d script's chmod/chown routine on log directories and files
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  5 Mar 2014 12:56:00 +0100
+
 kolab (3.1.0-36) unstable; urgency=low
 
   * Start kolab-saslauthd with the correct permissions