X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/0b6e8c5ac68138e70205a1998a2597aacee6483e..f7e84f4af6ad54548a376989e8fda6dce7e7593e:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7054cdc..70ebe43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-mr (0.39) UNRELEASED; urgency=low
+mr (0.40) unstable; urgency=low
+
+  * Pass --pull to bzr merge to avoid needing to commit
+    merged changes. Closes: #524352
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 31 Jul 2009 13:47:22 -0400
+
+mr (0.39) unstable; urgency=low
 
   * Determine current branch for fake-bare update (martin f. krafft)
 
- -- Joey Hess <joeyh@debian.org>  Sun, 01 Mar 2009 15:10:06 -0500
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 22:50:54 -0400
 
 mr (0.38) unstable; urgency=low