# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1360848393 -3600
# Node ID fa1e27a93fb200e2fca5c2bee38376de6ab0b20a
# Parent  06b2951ee81db912bee3e848454ef3f44e158e53# Parent  c0a06ac390cc302d3fd17f6ecd78e12129348806
merge default into stable

diff -r 06b2951ee81d -r fa1e27a93fb2 .hgtags
--- a/.hgtags	Fri Jan 25 17:56:15 2013 +0100
+++ b/.hgtags	Thu Feb 14 14:26:33 2013 +0100
@@ -274,5 +274,7 @@
 c5400558f37079a8bf6f2cd27a1ffd49321f3d8b cubicweb-debian-version-3.15.7-1
 459d0c48dfafee903c15a5349d321f6e8f998cbb cubicweb-version-3.15.8
 4ef457479337396f63bf00c87cedcbb7cb5a6eee cubicweb-debian-version-3.15.8-1
+8bfc0753f1daa37a6a268287dd2848931fca1f95 cubicweb-version-3.15.9
+29fbc632a69667840294d7b38b0ca00e5f66ec19 cubicweb-debian-version-3.15.9-1
 6c7c2a02c9a0ca870accfc8ed1bb120e9c858d5d cubicweb-version-3.16.0
 853237d1daf6710af94cc2ec8ee12aa7dba16934 cubicweb-debian-version-3.16.0-1
diff -r 06b2951ee81d -r fa1e27a93fb2 __pkginfo__.py
diff -r 06b2951ee81d -r fa1e27a93fb2 debian/changelog
--- a/debian/changelog	Fri Jan 25 17:56:15 2013 +0100
+++ b/debian/changelog	Thu Feb 14 14:26:33 2013 +0100
@@ -4,6 +4,12 @@
 
  -- Aurélien Campéas <aurelien.campeas@logilab.fr>  Wed, 23 Jan 2013 17:40:00 +0100
 
+cubicweb (3.15.9-1) squeeze; urgency=low
+
+  * New upstream release
+
+ -- David Douard <david.douard@logilab.fr>  Fri, 25 Jan 2013 17:49:58 +0100
+
 cubicweb (3.15.8-2) UNRELEASED; urgency=low
 
   * Don't compress txt files.  They're used by the doc's search functionality,
diff -r 06b2951ee81d -r fa1e27a93fb2 devtools/cwwindmill.py
--- a/devtools/cwwindmill.py	Fri Jan 25 17:56:15 2013 +0100
+++ b/devtools/cwwindmill.py	Thu Feb 14 14:26:33 2013 +0100
@@ -45,7 +45,7 @@
         tags = CubicWebServerTC.tags & Tags(('windmill',))
 
         def testWindmill(self):
-            self.skipTest("can't import windmill %s" % ex)
+            self.skipTest("can't import windmill")
 else:
     # Excerpt from :ref:`windmill.authoring.unit`
     class UnitTestReporter(functest.reports.FunctestReportInterface):