# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435302325 25200
# Node ID 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f
# Parent  773f3edb3cb27a7dd6613d86ae6ca5ef772b303a# Parent  49e43f20a579bb703b545cc351096b64d52bdb48
merge with 3.3

diff -r 773f3edb3cb2 -r 44a9dcb3fefc debian/changelog
--- 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
 
diff -r 773f3edb3cb2 -r 44a9dcb3fefc hgext/evolve.py
--- 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/'