[Commits] [wesnoth/wesnoth] e52151: Coalesce conflicting changelog entries

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: e52151aea12caa6489668ab0e9fa2663fa39e746
      https://github.com/wesnoth/wesnoth/commit/e52151aea12caa6489668ab0e9fa2663fa39e746
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Coalesce conflicting changelog entries