# HG changeset patch # User Sylvain Thénault # Date 1267194990 -3600 # Node ID 716ee59d64a75248c353a1f3d8ef8d4b11d626af # Parent 6267f9c3bfbdcb8cb91b8c1ad493f3e3b381efc9# Parent d4ae6e751b600caa416dcd545e4788c9b5d4ae25 merge diff -r 6267f9c3bfbd -r 716ee59d64a7 .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