# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1265815974 -3600
# Node ID 450804da3ab2476b7ede0c1f956235b4c239734f
# Parent  d74098d1b69f2be31e1b16796f5ab0176832eaf2# Parent  2832da80d9b7af28a104e9a5fa2e4bd94668e21d
merge

diff -r d74098d1b69f -r 450804da3ab2 .hgtags
--- a/.hgtags	Wed Feb 10 16:32:32 2010 +0100
+++ b/.hgtags	Wed Feb 10 16:32:54 2010 +0100
@@ -98,3 +98,5 @@
 4920121d41f28c8075a4f00461911677396fc566 cubicweb-debian-version-3.5.11-1
 98af3d02b83e7635207781289cc3445fb0829951 cubicweb-version-3.5.12
 4281e1e2d76b9a37f38c0eeb1cbdcaa2fac6533c cubicweb-debian-version-3.5.12-1
+5f957e351b0a60d5c5fff60c560b04e666c3a8c6 cubicweb-version-3.6.0
+17e88f2485d1ea1fb8a3926a274637ce19e95d69 cubicweb-debian-version-3.6.0-1