merge stable heads stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Mon, 13 Sep 2010 16:46:52 +0200
branchstable
changeset 6226 dbb7ad04b963
parent 6224 1f4beef3962d (diff)
parent 6222 21772f4e41d9 (current diff)
child 6227 82d4011f54c1
child 6230 91c053c110c3
merge stable heads
misc/migration/3.6.0_Any.py
--- a/.hgtags	Mon Sep 13 14:32:46 2010 +0200
+++ b/.hgtags	Mon Sep 13 16:46:52 2010 +0200
@@ -149,3 +149,5 @@
 8d32d82134dc1d8eb0ce230191f34fd49084a168 cubicweb-debian-version-3.9.4-1
 0a1fce8ddc672ca9ee7328ed4f88c1aa6e48d286 cubicweb-version-3.9.5
 12038ca95f0fff2205f7ee029f5602d192118aec cubicweb-debian-version-3.9.5-1
+d37428222a6325583be958d7c7fe7c595115663d cubicweb-version-3.9.6
+7d2cab567735a17cab391c1a7f1bbe39118308a2 cubicweb-debian-version-3.9.6-1