Resolve changelog conflict

[offlineimap] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7638f433af91e3290ceb780856c56bf8a9b6d346..ce9d072099cd553c6aa0d1be62718585df74406e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+offlineimap (4.0.15) unstable; urgency=low
+
+  * Applied patch from Aaron Schrab to sync INTERNALDATEs.
+
+ -- John Goerzen <jgoerzen@complete.org>  Mon, 21 Aug 2006 05:17:48 -0500
+
 offlineimap (4.0.14) unstable; urgency=low
 
   * ACK NMU 4.0.13-0.1.  Thanks, Pierre.  Closes: #380880.