From 2ff764553026bac1de305599e31f7d70389bb3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 22 Oct 2012 22:59:28 +0200
Subject: [PATCH 1/5] Increase version number

---
 tryton.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tryton.cfg b/tryton.cfg
index 7273173c87..86b1899f6a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     product

From b9b5a6952f75ea43c4b0658f11a27dc3472e637d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 20 Feb 2013 10:35:43 +0100
Subject: [PATCH 2/5] Fix missing Template from pool

issue2994
review662006
(transplanted from 45cc7793b87fb5976dd8dfccecca746f3a9a1d8f)
---
 product.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/product.py b/product.py
index f226809346..3449c3e2ea 100644
--- a/product.py
+++ b/product.py
@@ -29,6 +29,7 @@ class Template:
         Move = pool.get('stock.move')
         Uom = pool.get('product.uom')
         Location = pool.get('stock.location')
+        Template = pool.get('product.template')
 
         locations = Location.search([
             ('type', '=', 'storage'),

From 844d8f9597c393e7a15efa300a9dde8b1ae07a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 May 2013 10:27:04 +0200
Subject: [PATCH 3/5] Prepare release 2.6.1

---
 CHANGELOG | 3 +++
 COPYRIGHT | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d32cda08d4..716b43b23e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c724d0..d7165c7ec9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

From 30f07f815764d5f509c69843a9a881c94ca9f00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 May 2013 10:27:04 +0200
Subject: [PATCH 4/5] Added tag 2.6.1 for changeset fd12989afbc9

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5c5f22fa41..6c6c8a117d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -6,3 +6,4 @@ ecee03bbb3c81937705c5bbe899c6220e6354e60 2.0.0
 4258202b2c88a6ccf244fc3356259ecdfe837d22 2.2.0
 a002f48e1405f5a63932c9820bdc442ecfea3334 2.4.0
 c7477fefe7277fd7cc8eeb46fb11285f553370db 2.6.0
+fd12989afbc9a69e2ac51a4ca62776f1e9c46ff0 2.6.1

From 0a6573de923d1d86e0aa90cae26deaccd2292a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 May 2013 10:27:12 +0200
Subject: [PATCH 5/5] Increase version number

---
 tryton.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tryton.cfg b/tryton.cfg
index 86b1899f6a..1f662ca4bf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     ir
     product