Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 28 Mar 2010 16:06:22 +0000 (18:06 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 28 Mar 2010 16:06:22 +0000 (18:06 +0200)
1  2 
ChangeLog
doc/automake.texi

diff --cc ChangeLog
Simple merge
Simple merge