Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 8 Sep 2011 15:12:38 +0000 (17:12 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 8 Sep 2011 15:14:26 +0000 (17:14 +0200)
commiteae542988e2cf151abd296864ee12dfee9c74c6d
tree8efed982d1468d9dcf00c48eca3c5d1ea135505b
parente1177186ff44b11d6c14d74637bb2564b84151d0
parent30f99cbd07736c96603d15346fc8ad9097a0dddd
Merge branch 'maint'

* maint:
  aclocal: more granularity in acdir overriding
ChangeLog
NEWS
aclocal.in
bootstrap
doc/automake.texi
m4/Makefile.in
tests/Makefile.am
tests/Makefile.in
tests/aclocal-print-acdir.test
tests/aclocal.test