Merge pull request #2193 from fabrixxm/changelog
authorMichael Vogel <icarus@dabo.de>
Tue, 22 Dec 2015 08:52:12 +0000 (09:52 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 22 Dec 2015 08:52:12 +0000 (09:52 +0100)
Update CHANGELOG


Trivial merge