Baystation12/Baystation12 — pull request #5226 by Mloc (2014-06-12 17:43:17+00:00)
Title: fix changelog merging

Merging changelogs actually works now and seems to handle conflicts quite well.