# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1393028049 -3600
# Node ID 4ff966d017f349b4e335b8c2640f2d61637fce94
# Parent  b3a6e8f6e0838eaf6695cf9f4dfd6c13cd27d66b# Parent  65d65c22aeb218fc4a3a8098963bd9dc335fcfa9
Merged upstream changes.

diff -r b3a6e8f6e083 -r 4ff966d017f3 debian/changelog
--- a/debian/changelog	Sat Feb 22 01:12:28 2014 +0100
+++ b/debian/changelog	Sat Feb 22 01:14:09 2014 +0100
@@ -1,3 +1,15 @@
+kolab-webadmin (3.1.4-0~kolab2) unstable; urgency=low
+
+  * Fix typos in memcached related methods
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  9 Jan 2014 22:08:00 +0100
+
+kolab-webadmin (3.1.4-0~kolab1) unstable; urgency=low
+
+  * New upstream release 3.1.4
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  7 Jan 2014 22:08:00 +0100
+
 kolab-webadmin (3.1.3-0~kolab2) unstable; urgency=low
 
   * Fix #2596, which incidentally allowed the primary address to be