Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 27 Dec 2011 21:46:15 +0000 (22:46 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 27 Dec 2011 21:46:15 +0000 (22:46 +0100)
commitb0d61b88dde709cf138a46728fb8544066351bec
tree9c7ca8e342b8a6871d117e707935a3ac39c6f54e
parent144a61d521d65af7bdc14f1f0808d2f8bac64dd5
parentf533e9d43dfe84f0e1706855bdd49579df5c4f5b
Merge branch 'maint' into branch-1.11

* maint:
  fix: last ChangeLog entry
ChangeLog