# HG changeset patch
# User Sylvain <syt@logilab.fr>
# Date 1229702700 -3600
# Node ID 716f178f293626aa10effc738b300fd5d718b84a
# Parent  3ab7db44f8d8870ea2ea2710c3529195ccbe8ae9# Parent  6ba006fb95d16e6470946d5633d85c32ec11894c
merge

diff -r 6ba006fb95d1 -r 716f178f2936 .hgtags
--- a/.hgtags	Fri Dec 19 17:03:15 2008 +0100
+++ b/.hgtags	Fri Dec 19 17:05:00 2008 +0100
@@ -5,3 +5,5 @@
 eaf1089ae49d19cd8ae81732ff20e1003af0a238 cubicweb-debian-version-2_99_4-1
 68b7a92468857ef741b91f3422ef14d78e3f5491 cubicweb-version-2_99_5
 91793edd3b2fb11320b5421895296331da952524 cubicweb-debian-version-2_99_5-1
+5b58fd1aba50680e261857dcc47ede0d1c2ecc59 cubicweb-version-2_99_6
+c718f6495ace1e33831862f221e1b93ee0b386e2 cubicweb-debian-version-2_99_6-1