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

2