# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1399915659 -7200
# Node ID e01750dbb5d20bf6e9e58b912dfeb5b41e9ed5cd
# Parent  21f427f484ae96549b4a42f6241a25cf6d6fd251# Parent  360e514902eb6bd569b9120c73530993e9cd6070
Merged upstream changes.

diff -r 21f427f484ae -r e01750dbb5d2 debian/changelog
--- a/debian/changelog	Thu Mar 13 22:44:37 2014 +0100
+++ b/debian/changelog	Mon May 12 19:27:39 2014 +0200
@@ -1,3 +1,9 @@
+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