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

---
 CHANGELOG          | 2 ++
 doc/conf.py        | 4 ++--
 trytond/version.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d08521d863..0ae4ff43e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
 * Add pre-validation
 * Allow to use XML file for views
 * Add RPC definition
diff --git a/doc/conf.py b/doc/conf.py
index 3fe5d8b806..404036d894 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,9 +48,9 @@ copyright = (u'2008-2011, Bertrand Chenal, Cédric Krier, Ian Wilson, '
 # built documents.
 #
 # The short X.Y version.
-version = '2.5'
+version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.5'
+release = '2.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/trytond/version.py b/trytond/version.py
index a75ba53699..9efd8dc009 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "2.5.0"
+VERSION = "2.6.0"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"