[Python-apps-commits] r9668 - in packages/hg-git/trunk/debian (changelog)

[fqj1994-guest at users.alioth.debian.org]

    Date: Friday, May 24, 2013 @ 08:56:20
  Author: fqj1994-guest
Revision: 9668

resolve conflicts on changelog

Modified:
  packages/hg-git/trunk/debian/changelog

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2013-05-23 23:38:22 UTC (rev 9667)
+++ packages/hg-git/trunk/debian/changelog	2013-05-24 08:56:20 UTC (rev 9668)
@@ -1,9 +1,14 @@
-hg-git (0.3.4-2) UNRELEASED; urgency=low
+hg-git (0.4.0-1) unstable; urgency=low
 
-  * Use canonical URIs for Vcs-* fields.
+    [Jakub Wilk]
+    * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:12 +0200
+    [Qijiang Fan]
+    * New upstream release.
+    * New release fixes broken `hg out` (closes: #686855).
 
+ -- Qijiang Fan <fqj1994 at gmail.com>  Fri, 24 May 2013 16:45:14 +0800
+
 hg-git (0.3.4-1) unstable; urgency=low
 
   * New upstream release.