Bug#824248: Ok, fixed

[Julien Puydt]

Hi,

I solved the conflict and uploaded a new source package to mentors.

Sorry,

Snark on #debian-python