Merge branch 'master' into test-protocols
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 10 Sep 2011 22:45:20 +0000 (00:45 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 10 Sep 2011 22:45:20 +0000 (00:45 +0200)
commit8cee92bd50e2c5ca47029aec11b35817e30b3bf0
tree7ced8f90ef4b144502ebfcf4b31321ee9273020e
parentac2300d4878e0342fb292d9c2fbeaf717c15febb
parent074b1188ea90da631ead2201ef66c7375d5a1e5c
Merge branch 'master' into test-protocols

* master:
  tests: fix spurious failure on fast machines
  aclocal: better URL reference in error message
ChangeLog