Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 8 Dec 2011 17:24:21 +0000 (18:24 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 8 Dec 2011 17:24:21 +0000 (18:24 +0100)
commit5582cec911bfbc76ca40bc20c963b800c0f01640
tree63b88675e9230ceb490b6428ee5a94dc8175aa84
parentca29afc5aed617f61e11b155b21034690329ac67
parent6346183ddc86743708ecf796acca88a6e93171e3
Merge branch 'maint' into branch-1.11

* maint:
  maint: sync auxiliary files from upstream
ChangeLog