From 74f282b64ca337c2fecdc67f5f955c01c5a3e74c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 8 May 2010 17:47:46 +0200
Subject: [PATCH] Prepare release 1.6.0

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

diff --git a/CHANGELOG b/CHANGELOG
index ead06a9474..d675bcc17e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Version 1.6.0 - 2010-05-08
+* Bug fixes (see mercurial logs for details)
 * Don't stop wizard execution when exception occurs
 * Use ir.attachment view instead of a custom one
 * Add fingerprint and CA check for SSL connection
diff --git a/doc/conf.py b/doc/conf.py
index db51dee90b..2909eeb318 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,9 +48,9 @@ copyright = u'2008-2010,  Anne Krings, Bertrand Chenal, Cédric Krier, \
 # built documents.
 #
 # The short X.Y version.
-version = '1.5'
+version = '1.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.5'
+release = '1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/tryton/version.py b/tryton/version.py
index 28c262d2a2..dc1781dfc6 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,7 +1,7 @@
 #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 = "tryton"
-VERSION = "1.5.0"
+VERSION = "1.6.0"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"