# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1284655420 -7200
# Node ID 83179ccbda1f784114a45d02ec33c103400bb30e
# Parent  cb4a48b2250e20348404da35e11ba966e3299862# Parent  9d20b138775180a11755908bfc7ac371b5e97027
merge stable heads

diff -r cb4a48b2250e -r 83179ccbda1f .hgtags
--- a/.hgtags	Thu Sep 16 18:43:17 2010 +0200
+++ b/.hgtags	Thu Sep 16 18:43:40 2010 +0200
@@ -151,3 +151,5 @@
 12038ca95f0fff2205f7ee029f5602d192118aec cubicweb-debian-version-3.9.5-1
 d37428222a6325583be958d7c7fe7c595115663d cubicweb-version-3.9.6
 7d2cab567735a17cab391c1a7f1bbe39118308a2 cubicweb-debian-version-3.9.6-1
+de588e756f4fbe9c53c72159c6b96580a36d3fa6 cubicweb-version-3.9.7
+1c01f9dffd64d507863c9f8f68e3585b7aa24374 cubicweb-debian-version-3.9.7-1