Merge branch 'maint' into branch-1.11
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 22 Jan 2011 17:30:36 +0000 (18:30 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 22 Jan 2011 17:30:36 +0000 (18:30 +0100)
1  2 
ChangeLog
doc/automake.texi

diff --cc ChangeLog
Simple merge
Simple merge