From e697cd2647ecbb58dc5e366ea8bfa2ea1326e0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 22 Oct 2012 17:49:19 +0200
Subject: [PATCH] Prepare release 2.6.0

---
 CHANGELOG  | 3 +++
 tryton.cfg | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a637465992..27d27c7ad3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.0 - 2012-04-24
 * Bug fixes (see mercurial logs for details)
 * Manage negative amounts in sale
diff --git a/tryton.cfg b/tryton.cfg
index b30087bb59..4f672febb7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.5.0
+version=2.6.0
 depends:
     account
     account_invoice