From 87e067ca938dd0ed23e45b55d60c0fd859d037c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Thu, 21 Apr 2016 19:48:29 +0200
Subject: Merging upstream version 20160415.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 CHANGELOG.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'CHANGELOG.txt')

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3de75c9..55c178c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,16 @@
+2016-04-15	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20160415.
+	* Fixing minor issues:
+	  - build system
+	  - container-shell program
+	  - documentation
+	  - systemd unit for container-autostart
+	* Updated debian default mirror from httpredir.debian.org to ftp.debian.org.
+
+	* Backward incompatible changes:
+	  - container stop command option -k|--kill renamed to -f|--force for consistency
+
 2016-04-01	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20160401.
-- 
cgit v1.2.3