merge back with stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 08 Aug 2014 23:16:24 -0700
changeset 1051 d2fe19c818ea
parent 1047 d830377bf186 (current diff)
parent 1050 d265efad02cc (diff)
child 1056 edfb9a0ad085
merge back with stable
--- a/.hgtags	Fri Aug 08 23:02:26 2014 -0700
+++ b/.hgtags	Fri Aug 08 23:16:24 2014 -0700
@@ -24,3 +24,4 @@
 a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2
 0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0
 e914884fb7210d6350d94909cb25ebc602359680 4.0.1
+4d5d101e878f6d6264a8e036b11afdf922c4ef94 4.1.0
--- a/README	Fri Aug 08 23:02:26 2014 -0700
+++ b/README	Fri Aug 08 23:16:24 2014 -0700
@@ -57,7 +57,7 @@
 Changelog
 =========
 
-4.1.0 --
+4.0.1 -- 2014-08-08
 
 - amend: add -D/--current-date option
 - amend: add -U/--current-user option
--- a/debian/changelog	Fri Aug 08 23:02:26 2014 -0700
+++ b/debian/changelog	Fri Aug 08 23:16:24 2014 -0700
@@ -1,3 +1,9 @@
+mercurial-evolve (4.1.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net>  Fri, 08 Aug 2014 23:15:11 -0700
+
 mercurial-evolve (4.0.1-1) unstable; urgency=medium
 
   * new upstream release