From 30737852a251dc1699da3ac75e6114cecd191c16 Mon Sep 17 00:00:00 2001
From: Julien Maupetit <julien@tailordev.fr>
Date: Thu, 21 Jan 2016 16:03:42 +0100
Subject: [PATCH] Bump release to 1.2.0

---
 CHANGELOG.md      | 11 +++++++++++
 watson/version.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac68960b..26f8ca5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ CHANGELOG
 This document records all notable changes to Watson. This project adheres to
 [Semantic Versioning](http://semver.org/).
 
+## 1.2.0 (2016-01-22)
+
+* Added: Watson now has a `restart` command
+* Added: Watson now has a `merge` command
+* Added: Watson can now stop running project when starting a new one (optional)
+* Added: there is a wrapper for `RawConfigParser` to make option access more convenient
+* Updated: the `edit` command now defaults to the running frame if any (else defaults to the last one)
+* Updated: the `log` command now has a daily total time summary
+* Fixed: unicode issues with cjk characters
+* Fixed: edition summary is now converted to local time
+
 ## 1.1.0 (2015-10-21)
 
 * Added: configurable date and time to output of `status` command (#33)
diff --git a/watson/version.py b/watson/version.py
index 77f5854e..cdfe2ee1 100644
--- a/watson/version.py
+++ b/watson/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-version = "1.1.0"
+version = "1.2.0"