Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 22 Nov 2011 10:52:54 +0000 (11:52 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 22 Nov 2011 10:52:54 +0000 (11:52 +0100)
* maint:
  fix: regenerate doc/Makefile

1  2 
doc/Makefile.in

diff --cc doc/Makefile.in
Simple merge