merge stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Tue, 23 Jun 2009 12:12:56 +0200
branchstable
changeset 2139 8969443bd21c
parent 2138 c9263a17aed5 (diff)
parent 2136 ffd6c68bc485 (current diff)
child 2142 098aa2075903
merge
--- a/.hgtags	Tue Jun 23 10:54:46 2009 +0200
+++ b/.hgtags	Tue Jun 23 12:12:56 2009 +0200
@@ -40,3 +40,4 @@
 4003d24974f15f17bd03b7efd6a5047cad4e4c41 cubicweb-debian-version-3_2_3-1
 2d7d3062ca03d4b4144100013dc4ab7f9d9cb25e cubicweb-version-3_3_0
 07214e923e75c8f0490e609e9bee0f4964b87114 cubicweb-debian-version-3_3_0-1
+a356da3e725bfcb59d8b48a89d04be05ea261fd3 3.3.1
--- a/__pkginfo__.py	Tue Jun 23 10:54:46 2009 +0200
+++ b/__pkginfo__.py	Tue Jun 23 12:12:56 2009 +0200
@@ -7,7 +7,7 @@
 distname = "cubicweb"
 modname = "cubicweb"
 
-numversion = (3, 3, 0)
+numversion = (3, 3, 1)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL v2'
--- a/debian/changelog	Tue Jun 23 10:54:46 2009 +0200
+++ b/debian/changelog	Tue Jun 23 12:12:56 2009 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.3.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Aurélien Campéas <aurelien.campeas@logilab.fr>  Mon, 22 Jun 2009 12:00:00 +0200
+
 cubicweb (3.3.0-1) unstable; urgency=low
 
   * new upstream release