# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1348068944 -7200
# Node ID fa3621931db06ddba51ea6147e7ec1477b55951f
# Parent  2c57e2b5afde9f3e01ece4794c611af9cd8f7fa4# Parent  61e883010b893566fd6c5656ee67097ebaa5f2a8
merge (overwrite wrong tag)

diff -r 61e883010b89 -r fa3621931db0 .hgtags
--- a/.hgtags	Sun Sep 16 04:19:52 2012 +0200
+++ b/.hgtags	Wed Sep 19 17:35:44 2012 +0200
@@ -11,3 +11,4 @@
 b18b000363550f02f413aed008f8e306318c608c 1.0.0
 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
+5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
diff -r 61e883010b89 -r fa3621931db0 setup.py
--- a/setup.py	Sun Sep 16 04:19:52 2012 +0200
+++ b/setup.py	Wed Sep 19 17:35:44 2012 +0200
@@ -5,7 +5,7 @@
 
 setup(
     name='hg-evolve',
-    version='1.0.1',
+    version='1.0.2',
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@logilab.fr',