Move ports around to allow master/server to coexist (#962).

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b1ffde15b..b1fcbb37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27  Carl Hetherington  <cth@carlh.net>
+
+	* Stop master and server instances fighting over ports, allowing them to coexist (#962).
+
 2017-04-26  Carl Hetherington  <cth@carlh.net>
 
 	* Make a copy of the configuration, if it fails to load, before making new defaults.