Merge branch 'master' into test-protocols
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 8 Sep 2011 15:52:22 +0000 (17:52 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 8 Sep 2011 15:52:22 +0000 (17:52 +0200)
commit95d11c290f223a8aa3f3e2e3474020e8a10585aa
treef4204b97dd8335a510b496542905b87dc9124046
parent55bada2cf9fb9481fbf24f3205fefe6499433c38
parenteae542988e2cf151abd296864ee12dfee9c74c6d
Merge branch 'master' into test-protocols

* master:
  aclocal: more granularity in acdir overriding
ChangeLog
NEWS
doc/automake.texi
tests/Makefile.am
tests/Makefile.in