Merge branch 'maint' into yacc-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Apr 2011 15:25:34 +0000 (17:25 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Apr 2011 15:25:34 +0000 (17:25 +0200)
commit2b1609fc05d829fa8bf10dda48de81396515ddc1
tree846ee8cb13c91c098bd5314e30a3f08e7ee8aac0
parent4ed586c011158cb60ba310fb20604184c5b25ebc
parentac6764da0c0ad499e51a36db0a818b03b697ef37
Merge branch 'maint' into yacc-work

Conflicts:
ChangeLog
NEWS
tests/Makefile.am
tests/Makefile.in
tests/cond36.test
tests/yacc5.test
ChangeLog
NEWS
automake.in
doc/automake.texi
tests/Makefile.am
tests/Makefile.in
tests/defs.in
tests/yacc5.test