From f4d967f3c32bde800fad90057bf3d792cbed4118 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Thu, 14 May 2015 11:06:27 +0200
Subject: [PATCH] updated to latest changes

---
 ChangeLog.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 4d811030..47e28413 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,17 @@
+# next version (2015-05-?)
+
+## Bug fixes
+* corrected missing newline in ebusctl
+* avoid updating last message change time when only the querying master was modified
+
+## Features
+* new command line option "--readonly" for read-only access to the bus
+* added support for retrieving data as JSON and additional files via optional HTTP port
+
+## Changed files
+https://github.com/john30/ebusd/compare/v1.1.0...master
+
+
 # 1.1.0 (2015-03-28)
 
 ## Bug fixes