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)
* master:
  tests: fix spurious failure on fast machines
  aclocal: better URL reference in error message

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge