merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 26 Feb 2010 15:36:30 +0100
branchstable
changeset 4732 716ee59d64a7
parent 4729 6267f9c3bfbd (current diff)
parent 4731 d4ae6e751b60 (diff)
child 4733 022290f7503d
merge
.hgtags
--- a/.hgtags	Fri Feb 26 15:32:32 2010 +0100
+++ b/.hgtags	Fri Feb 26 15:36:30 2010 +0100
@@ -100,4 +100,5 @@
 4281e1e2d76b9a37f38c0eeb1cbdcaa2fac6533c cubicweb-debian-version-3.5.12-1
 5f957e351b0a60d5c5fff60c560b04e666c3a8c6 cubicweb-version-3.6.0
 17e88f2485d1ea1fb8a3926a274637ce19e95d69 cubicweb-debian-version-3.6.0-1
-a0571ff0cb5da51c20a56318a2c1cb81e4a5220e 3.5
+450804da3ab2476b7ede0c1f956235b4c239734f cubicweb-version-3.6.0
+d2ba93fcb8da95ceab08f48f8149a480215f149c cubicweb-debian-version-3.6.0-1