# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1340200677 -7200
# Node ID d64f8468aaf996e85d946405a9c52b9160f912b0
# Parent  691cb55358b05323db7000edefd1f59b688b8bcd# Parent  bcd96748edc4ffee10e157de016c08440f6804a2
merge back with stable tag

diff -r 691cb55358b0 -r d64f8468aaf9 .hgtags
--- a/.hgtags	Wed Jun 20 14:43:20 2012 +0200
+++ b/.hgtags	Wed Jun 20 15:57:57 2012 +0200
@@ -1,1 +1,2 @@
 6c6bb7a23bb5125bf06da73265f039dd3447dafa 0.1.0
+d3f20770b86a31dba56ae7b252089e12b34702da 0.2.0