debian/source/format
author Julien Cristau <julien.cristau@logilab.fr>
Mon, 13 Jan 2014 13:56:16 +0100
changeset 9403 d81207fb9499
parent 6708 09c98763ae9d
child 12642 5722d8c461eb
permissions -rw-r--r--
Fix a couple merge errors

1.0