# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410472970 -7200
# Node ID 7f4e8cdff4986ede88e6a2cf384f4a6dde09cf49
# Parent  e01750dbb5d20bf6e9e58b912dfeb5b41e9ed5cd# Parent  f78efeacc8090a8e3ca54caa9c9340df5206f118
Merged changes from upstream and the paul branch.

diff -r e01750dbb5d2 -r 7f4e8cdff498 debian/changelog
--- a/debian/changelog	Mon May 12 19:27:39 2014 +0200
+++ b/debian/changelog	Fri Sep 12 00:02:50 2014 +0200
@@ -1,3 +1,11 @@
+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
diff -r e01750dbb5d2 -r 7f4e8cdff498 debian/copyright
--- a/debian/copyright	Mon May 12 19:27:39 2014 +0200
+++ b/debian/copyright	Fri Sep 12 00:02:50 2014 +0200
@@ -1,7 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kolab
+Upstream-Contact: Kolab Systems AG <contact@kolabsys.com>
+Source: http://www.kolab.org
 
 Files: *
-Copyright: Copyright (C) 2012 Kolab Systems - Jeroen van Leeuwen <vanmeeuwen@kolabsys.com>
+Copyright: 2012-2014, Kolab Systems AG <contact@kolabsys.com>
 License: GPL-3+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public