From a97a305f6cc89c4c06a01ed0ed7259b9997f8c13 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@mozcode.nl>
Date: Fri, 19 Jun 2015 22:08:08 +0200
Subject: [PATCH 1/2] Bump version to 1.14.0

---
 stoptime.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stoptime.rb b/stoptime.rb
index 817b911..c38b0be 100644
--- a/stoptime.rb
+++ b/stoptime.rb
@@ -54,7 +54,7 @@ end
 module StopTime
 
   # The version of the application
-  VERSION = '1.12.1'
+  VERSION = '1.14.0'
   puts "Starting Stop… Camping Time! version #{VERSION}"
 
   # @return [Hash{String=>Object}] The parsed configuration.

From 0d75f1aaae2855f1b0d65d412adcd9987f8a6e2a Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@mozcode.nl>
Date: Fri, 19 Jun 2015 22:11:06 +0200
Subject: [PATCH 2/2] Update the changelog for the 1.14.0 release

---
 CHANGELOG.rdoc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index e8a5597..de33843 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,5 +1,13 @@
 = Stop… Camping Time! release news
 
+== 1.14.0
+
+Features:
+
+* Show customer specific time entries in the customer form [#08650a]
+  * Also allow for registering time for the customer
+* Show a grand total of unbilled hours and amount in the overview
+
 == 1.12.1
 
 Small update release to include to missing 1.12 change log and added