# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435279390 25200
# Node ID 00026533ff9f52733a45df008e3d56a5d3a8e76a
# Parent  1bcbd14cf159291ad6de83ffdc5003f3ee8295c5# Parent  c79bdc8563509cd4e99946593d0b39af40271a30
merge with preparation for version 5.2.0

diff -r 1bcbd14cf159 -r 00026533ff9f README
--- a/README	Thu Jun 25 17:37:43 2015 -0700
+++ b/README	Thu Jun 25 17:43:10 2015 -0700
@@ -51,7 +51,7 @@
 Changelog
 =========
 
-5.2.0 --
+5.2.0 -- 2015-06-25
 
 - evolve: gain a --rev option to control what revisions to evolve (issue4391)
 - evolve: revision are processed in the order they stack on destination
diff -r 1bcbd14cf159 -r 00026533ff9f debian/changelog
--- a/debian/changelog	Thu Jun 25 17:37:43 2015 -0700
+++ b/debian/changelog	Thu Jun 25 17:43:10 2015 -0700
@@ -1,8 +1,9 @@
-mercurial-evolve (5.1.5-1) UNRELEASED; urgency=medium
+mercurial-evolve (5.2.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * New upstream version
 
- -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net>  Tue, 23 Jun 2015 15:30:07 -0700
+ -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net>  Thu, 25 Jun 2015 17:41:56 -0700
 
 mercurial-evolve (5.1.3-1) unstable; urgency=medium
 
diff -r 1bcbd14cf159 -r 00026533ff9f hgext/evolve.py
--- a/hgext/evolve.py	Thu Jun 25 17:37:43 2015 -0700
+++ b/hgext/evolve.py	Thu Jun 25 17:43:10 2015 -0700
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.1.5'
+__version__ = '5.2'
 testedwith = '3.3.3 3.4.1'
 buglink = 'http://bz.selenic.com/'