# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1401839102 25200
# Node ID f889409bdcc30356b8dacc1cee9bdf6c8181b993
# Parent  5e2c277625958b0f473de8176fd848a7b75b8a5d# Parent  fc7ca26f74915c371f9cf2f1cfca85206edb7f55
merge with 4.0.0

diff -r 5e2c27762595 -r f889409bdcc3 .hgtags
--- a/.hgtags	Tue Jun 03 14:31:15 2014 -0700
+++ b/.hgtags	Tue Jun 03 16:45:02 2014 -0700
@@ -22,3 +22,4 @@
 83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0
 fc04758ea9f549684989ee673b04d9724756dc85 3.3.1
 a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2
+0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0
diff -r 5e2c27762595 -r f889409bdcc3 README
--- a/README	Tue Jun 03 14:31:15 2014 -0700
+++ b/README	Tue Jun 03 16:45:02 2014 -0700
@@ -47,7 +47,7 @@
 Changelog
 =========
 
-4.0.0 --
+4.0.0 -- 2014-06-03
 
 - require Mercurial version 3.0.1 or above
 - some compatibility fixes with future 3.1.0
diff -r 5e2c27762595 -r f889409bdcc3 debian/changelog
--- a/debian/changelog	Tue Jun 03 14:31:15 2014 -0700
+++ b/debian/changelog	Tue Jun 03 16:45:02 2014 -0700
@@ -1,8 +1,12 @@
-mercurial-evolve (3.2.0-1) UNRELEASED; urgency=low
+mercurial-evolve (4.0.0-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * New upstream release.
 
- -- Julien Cristau <julien.cristau@logilab.fr>  Tue, 04 Jun 2013 17:28:02 +0200
+  [ Pierre-Yves David ]
+  * new upstream release
+
+ -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net>  Tue, 03 Jun 2014 15:37:23 -0700
 
 mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low
 
diff -r 5e2c27762595 -r f889409bdcc3 setup.py
--- a/setup.py	Tue Jun 03 14:31:15 2014 -0700
+++ b/setup.py	Tue Jun 03 16:45:02 2014 -0700
@@ -5,7 +5,7 @@
 
 setup(
     name='hg-evolve',
-    version='3.3.2',
+    version='4.0.0',
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@ens-lyon.org',
@@ -14,5 +14,5 @@
     long_description=open('README').read(),
     keywords='hg mercurial',
     license='GPLv2+',
-    py_modules=['hgext.evolve', 'hgext.pushexperiment'],
+    py_modules=['hgext.evolve'],
 )