From 5c653c872bbc1117517b7e56e215237d315f41e5 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 11 Mar 2015 15:46:13 +0000
Subject: [PATCH] Update changes log

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 10bf83b..cd8a8ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2015.xx.xx:
+	* Add multi-master support. Thanks Fred Reimer(freimer). #555
+
 Version 2015.03.04:
 	* Fix the salt package selection on Arch stable installs.