intrigeri:
> spriver:
>> I'm fine with the changes, please pull from flapflap's branch.
>
> there are too many conflicts for me to solve ⇒ please merge current
> master branch and resubmit. Thanks!
The emails get through to the list again \o/
I'll have a look at the branch!