Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 30 Oct 2011 11:16:41 +0000 (12:16 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 30 Oct 2011 11:16:41 +0000 (12:16 +0100)
* maint:
  fix: regenerate Makefiles

1  2 
doc/Makefile.in

diff --cc doc/Makefile.in
Simple merge