Merge branch 'master' into test-protocols
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 18 Aug 2011 19:53:34 +0000 (21:53 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 18 Aug 2011 19:53:34 +0000 (21:53 +0200)
commit94aa58693d1a6fd09db715524e1785d062f1a252
treef1ffbde1c396ce0c1742b2dfd347db656704bbe3
parentc8b66be05a6301e5f82ee7b3b7a87727f5cecd9f
parent8c4d0f0650486315359a63b2b6a832dcf4986147
Merge branch 'master' into test-protocols

* master:
  * THANKS (Daniel Richard G.): Update e-mail address.
  java: avoid compilation errors when CLASSPATH is empty
  parallel-tests: no more spurious successes for FreeBSD make
  hacking: we now require autoconf 2.68
ChangeLog
NEWS
lib/Automake/tests/Makefile.in
lib/am/check.am
tests/Makefile.am
tests/Makefile.in