[parrot/parrot] f2f6fe: Add merged branches to ChangeLog, fix tabs

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/parrot/parrot
  Commit: f2f6febd67d5abbec95bd37426c04ee496a6cd96
      https://github.com/parrot/parrot/commit/f2f6febd67d5abbec95bd37426c04ee496a6cd96
  Author: Reini Urban <rurban at cpanel.net>
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Add merged branches to ChangeLog, fix tabs