# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1393099337 -3600
# Node ID 0ecef3a4bfd72cfd43bb36f5033e49dbae8e26d4
# Parent  19142842aee6b67e03edae1551f7c83bd9603bd6# Parent  36e753951e2bdd3e53d640a6175c3fc04fa7a539
Merge upstream changes.

diff -r 19142842aee6 -r 0ecef3a4bfd7 debian/changelog
--- a/debian/changelog	Sat Feb 22 01:28:33 2014 +0100
+++ b/debian/changelog	Sat Feb 22 21:02:17 2014 +0100
@@ -1,3 +1,9 @@
+kolab-webadmin (3.1.5-0~kolab1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 17 Feb 2014 22:08:00 +0100
+
 kolab-webadmin (3.1.4-0~kolab2) unstable; urgency=low
 
   * Fix typos in memcached related methods