Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 11 Jan 2011 01:07:51 +0000 (02:07 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 11 Jan 2011 01:07:51 +0000 (02:07 +0100)
commit6f00e5383376ff8acf2a571a1a979a4e188fb9b9
tree61885bfebec7fd9567898549f60850bdce1603df
parent23b41dc75e1423480e5e40d4076dbd36ab7372ee
parenta115c7c75580f71dd6c123bb1cdaa07f742fd3a3
Merge branch 'maint'

Conflicts:
tests/instdir-texi.test
tests/txinfo22.test
ChangeLog
tests/Makefile.am
tests/Makefile.in
tests/instdir-texi.test
tests/txinfo22.test