From 6ee6d034800caa5e2926759ab44310cc9888719e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 28 Nov 2016 15:55:37 +0100
Subject: [PATCH] Prepare release 4.2.0

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

diff --git a/CHANGELOG b/CHANGELOG
index 602f52febf..11335a133c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Version 4.2.0 - 2016-11-28
+* Bug fixes (see mercurial logs for details)
 * Add support for GTK+ 3.0
 * Add PYSON Widget
 * Show records names in wizard title
diff --git a/doc/conf.py b/doc/conf.py
index ab0d8b30bd..bf2682e65d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -46,9 +46,9 @@ copyright = u'2008-2011,  Anne Krings, Bertrand Chenal, Cédric Krier, \
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = '4.1'
+release = '4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/tryton/__init__.py b/tryton/__init__.py
index cc414e74c6..9d9331b889 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "4.1.0"
+__version__ = "4.2.0"