Oh, crud, I just noticed that the new upstream merge script has an incorrect shebang that needs patching as well, I've added this and re-uploaded to mentors and re-pushed to git.
-- Martin Erik Werner <martinerikwer...@gmail.com>
signature.asc
Description: This is a digitally signed message part
