merge stable
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Mon, 28 Mar 2011 19:31:45 +0200
branchstable
changeset 7127 a055a1649727
parent 7126 9ebc24d85bb5 (diff)
parent 7123 bb303290a6cb (current diff)
child 7128 f1fe05d5224e
merge
--- a/.hgtags	Mon Mar 28 17:58:46 2011 +0200
+++ b/.hgtags	Mon Mar 28 19:31:45 2011 +0200
@@ -186,3 +186,5 @@
 8daabda9f571863e8754f8ab722744c417ba3abf cubicweb-debian-version-3.11.0-1
 d0410eb4d8bbf657d7f32b0c681db09b1f8119a0 cubicweb-version-3.11.1
 77318f1ec4aae3523d455e884daf3708c3c79af7 cubicweb-debian-version-3.11.1-1
+56ae3cd5f8553678a2b1d4121b61241598d0ca68 cubicweb-version-3.11.2
+954b5b51cd9278eb45d66be1967064d01ab08453 cubicweb-debian-version-3.11.2-1
--- a/__pkginfo__.py	Mon Mar 28 17:58:46 2011 +0200
+++ b/__pkginfo__.py	Mon Mar 28 19:31:45 2011 +0200
@@ -22,7 +22,7 @@
 
 modname = distname = "cubicweb"
 
-numversion = (3, 11, 1)
+numversion = (3, 11, 2)
 version = '.'.join(str(num) for num in numversion)
 
 description = "a repository of entities / relations for knowledge management"
--- a/debian/changelog	Mon Mar 28 17:58:46 2011 +0200
+++ b/debian/changelog	Mon Mar 28 19:31:45 2011 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.11.2-1) unstable; urgency=low
+
+  * new upstream release 
+
+ -- Nicolas Chauvat <nicolas.chauvat@logilab.fr>  Mon, 28 Mar 2011 19:18:54 +0200
+
 cubicweb (3.11.1-1) unstable; urgency=low
 
   * new upstream release