Merge branch 'backcompat-tests'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 6 Nov 2010 19:49:22 +0000 (20:49 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 6 Nov 2010 19:49:22 +0000 (20:49 +0100)
commit4555c818e5ae6a90a8116e9c5b5b1ff6a65929c0
tree82deda4ca4dc82b5ffc74450e308c094b89a72e8
parentf7adc0f46ecd072da071e5d6f166988e4288285e
parentd3369343ca79dd1fd112c35eaa20f65bf43cdc02
Merge branch 'backcompat-tests'

Conflicts:
tests/Makefile.in
ChangeLog
tests/Makefile.am
tests/Makefile.in