From d787413eeed18bab7d048fcdf0ac3bf51e8ee73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 22 Oct 2012 17:34:13 +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 a6e8a0cd6c..d2beb67aef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.0 - 2012-04-23
 * Initial release
diff --git a/tryton.cfg b/tryton.cfg
index 119550832a..c3407df50f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.5.0
+version=2.6.0
 depends:
     carrier
     company