# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1343731676 -7200
# Node ID 9fcbe7c47939984e7829559655c1ca7ce18ab680
# Parent  b5b1bf5166a268395c1ec210ab1ff0264c44a6b2# Parent  24762f1911baf2228a6d1de2d51a3c73ec94043b
merge with stable

diff -r b5b1bf5166a2 -r 9fcbe7c47939 .hgtags
--- a/.hgtags	Tue Jul 31 12:45:24 2012 +0200
+++ b/.hgtags	Tue Jul 31 12:47:56 2012 +0200
@@ -4,3 +4,4 @@
 9bbcd274689829d9239978236e16610688978233 0.4.0
 4ecbaec1d664b1e6f8ebc78292e1ced77a8e69c0 0.4.1
 7ef8ab8c6feadb8a9d9e13af144a17cb23e9a38d 0.5
+4a5488c01a66be4729252175cea0ea739a88a540 0.6
diff -r b5b1bf5166a2 -r 9fcbe7c47939 hgext/obsolete.py