Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 7 May 2011 13:39:37 +0000 (15:39 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 7 May 2011 13:39:37 +0000 (15:39 +0200)
commit8e4e230f603e689c2415e1a621eafebb7540c6b2
tree2283519951f9cd9657c17e08ec0352468b927b28
parent955eccc6c890186b8e94be35911c1dd82da4f6b0
parenta370e2f5cd098af9b95314cdd49b0fbee6588a82
Merge branch 'maint'

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