Merge branch 'maint' into branch-1.11
commit61813db504b1991517c797a2dba7f09a9b66a784
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 7 Mar 2012 21:18:35 +0000 (7 22:18 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 7 Mar 2012 21:18:35 +0000 (7 22:18 +0100)
tree5c706336c25f498c807a641d2a1efbdbeac7e858
parenteef596b31b635e2a198cecbadc488117de98c4de
parent27f3c56209a91724b0d83d0dd655f0eae0a698a9
Merge branch 'maint' into branch-1.11

* maint:
  cosmetics: fix repeated changelog entry heading