Merge branch 'maint' into testsuite-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 7 May 2011 13:38:56 +0000 (15:38 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 7 May 2011 13:38:56 +0000 (15:38 +0200)
commit7fd7a7d1560a3181a98118d7d8869e8c78ea2e8c
tree86b74d272192d58fb3a4110e784de9cbd8693245
parentd6e4affddfacf8be419e64eb7ec50833f695a290
parenta370e2f5cd098af9b95314cdd49b0fbee6588a82
Merge branch 'maint' into testsuite-work

* maint:
  tests: fix spurious failure of txinfo21.test on FreeBSD
ChangeLog
tests/txinfo21.test