[Merge] lp:~hjd/ubuntu/wily/ninja-build/debian-merged into lp:ubuntu/ninja-build

[Hans Joachim Desserud]

It looks like I cannot attach files here, so please see the bug report for the output of `bzr diff -r tag:1.5.1-0.1` from this branch.
-- 
https://code.launchpad.net/~hjd/ubuntu/wily/ninja-build/debian-merged/+merge/264494
Your team Ubuntu branches is requested to review the proposed merge of lp:~hjd/ubuntu/wily/ninja-build/debian-merged into lp:ubuntu/ninja-build.