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)
commit826ba9f165d0893b23fb881134258bcc09041a69
tree9b086c2495db2bccfe824a08c666e32ac2a84c92
parent006c81818a2711be33d562590859448a23f02122
parentd2ef3f5bed77203bb8da5c5a0134a0dfa8c367d9
Merge branch 'maint' into branch-1.11

* maint:
  fix: regenerate doc/Makefile
doc/Makefile.in