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)
* maint:
  maint: sync auxiliary files from upstream

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge