merge with 3.3 stable 5.2.0
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 26 Jun 2015 00:05:25 -0700
branchstable
changeset 1460 44a9dcb3fefc
parent 1456 773f3edb3cb2 (current diff)
parent 1459 49e43f20a579 (diff)
child 1461 dd89ed2bb77e
merge with 3.3
hgext/evolve.py
--- a/debian/changelog	Thu Jun 25 17:45:25 2015 -0700
+++ b/debian/changelog	Fri Jun 26 00:05:25 2015 -0700
@@ -1,9 +1,8 @@
-mercurial-evolve (5.2.0-1) UNRELEASED; urgency=medium
+mercurial-evolve (5.2.0-1) unstable; urgency=medium
 
   * New upstream release.
-  * New upstream version
 
- -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net>  Thu, 25 Jun 2015 17:41:56 -0700
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Thu, 25 Jun 2015 17:41:56 -0700
 
 mercurial-evolve (5.1.3-1) unstable; urgency=medium
 
--- a/hgext/evolve.py	Thu Jun 25 17:45:25 2015 -0700
+++ b/hgext/evolve.py	Fri Jun 26 00:05:25 2015 -0700
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.2'
+__version__ = '5.2.0'
 testedwith = '3.3.3 3.4.1'
 buglink = 'http://bz.selenic.com/'