merge oldstable in stable stable
authorDavid Douard <david.douard@logilab.fr>
Thu, 02 Aug 2012 12:48:31 +0200
branchstable
changeset 8508 7801f2acd1dc
parent 8504 f21c72928662 (current diff)
parent 8507 0c111b232927 (diff)
child 8511 f15e90b914cd
merge oldstable in stable
.hgtags
__pkginfo__.py
debian/changelog
hooks/integrity.py
server/sources/native.py
--- a/.hgtags	Wed Aug 01 09:20:47 2012 +0200
+++ b/.hgtags	Thu Aug 02 12:48:31 2012 +0200
@@ -256,6 +256,8 @@
 20ee573bd2379a00f29ff27bb88a8a3344d4cdfe cubicweb-debian-version-3.14.7-1
 15fe07ff687238f8cc09d8e563a72981484085b3 cubicweb-version-3.14.8
 81394043ad226942ac0019b8e1d4f7058d67a49f cubicweb-debian-version-3.14.8-1
+9337812cef6b949eee89161190e0c3d68d7f32ea cubicweb-version-3.14.9
+68c762adf2d5a2c338910ef1091df554370586f0 cubicweb-debian-version-3.14.9-1
 783a5df54dc742e63c8a720b1582ff08366733bd cubicweb-version-3.15.1
 fe5e60862b64f1beed2ccdf3a9c96502dfcd811b cubicweb-debian-version-3.15.1-1
 2afc157ea9b2b92eccb0f2d704094e22ce8b5a05 cubicweb-version-3.15.2
--- a/debian/changelog	Wed Aug 01 09:20:47 2012 +0200
+++ b/debian/changelog	Thu Aug 02 12:48:31 2012 +0200
@@ -6,7 +6,7 @@
 
 cubicweb (3.15.1-1) quantal; urgency=low
 
-  * new upstream release 
+  * new upstream release
 
  -- David Douard <david.douard@logilab.fr>  Mon, 11 Jun 2012 09:45:24 +0200
 
@@ -16,6 +16,12 @@
 
  -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Thu, 12 Apr 2012 13:52:05 +0200
 
+cubicweb (3.14.9-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Tue, 31 Jul 2012 16:16:28 +0200
+
 cubicweb (3.14.8-1) unstable; urgency=low
 
   * new upstream release