Merge branch 'master' of github.com:jinwen/ninja
Merge branch 'master' of github.com:jinwen/ninja