debian/compat
author Julien Cristau <julien.cristau@logilab.fr>
Mon, 13 Jan 2014 13:56:16 +0100
changeset 9403 d81207fb9499
parent 858 e6ae125d5903
child 11832 e8be49ecb522
permissions -rw-r--r--
Fix a couple merge errors

7