Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 21 Aug 2010 09:05:25 +0000 (11:05 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 21 Aug 2010 09:07:11 +0000 (11:07 +0200)
1  2 
ChangeLog
HACKING
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
Simple merge
diff --cc HACKING
Simple merge
Simple merge
Simple merge