Merge branch 'master' of github.com:martine/ninja
authorEvan Martin <martine@danga.com>
Fri, 27 Jul 2012 19:39:12 +0000 (12:39 -0700)
committerEvan Martin <martine@danga.com>
Fri, 27 Jul 2012 19:39:12 +0000 (12:39 -0700)

Trivial merge