tests/test-simplemerge.py.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 08 Aug 2007 23:00:01 +0200
changeset 5124 06154aff2b1a
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
merge with -stable

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK