# HG changeset patch
# User Sylvain Thenault <sylvain.thenault@logilab.fr>
# Date 1229703730 -3600
# Node ID cb1f8a1d9d999558830644ef6b1ae7b66631e1ce
# Parent  26bd3a406889a69cf470fab756606097b842486b# Parent  716f178f293626aa10effc738b300fd5d718b84a
merge

diff -r 26bd3a406889 -r cb1f8a1d9d99 .hgtags
--- a/.hgtags	Fri Dec 19 17:21:35 2008 +0100
+++ b/.hgtags	Fri Dec 19 17:22:10 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