Prepare release 2.6.0

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

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.

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/"