From 548dfe22cce2164d6814efa37159949403c04ada Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@mozcode.nl>
Date: Sun, 11 Sep 2016 15:21:00 +0200
Subject: [PATCH] Update the changelog for the 0.17.0 release

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

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 6ec4f8e..ac74faa 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,5 +1,18 @@
 = Stop… Camping Time! release news
 
+== 1.17.0
+
+Features:
+
+* Add support for choosing what date/time is used for new entries
+* Some textual and style tweaks
+
+Bugfixes:
+* Fix crash when showing all entries in the timeline [#89c2a1]
+
+Other bugfixes:
+* Fix check that determines if last company info is used
+
 == 1.16.1
 
 Features: