Merge branch 'master' of github.com:martine/ninja
authorEvan Martin <martine@danga.com>
Mon, 13 Aug 2012 23:38:41 +0000 (16:38 -0700)
committerEvan Martin <martine@danga.com>
Mon, 13 Aug 2012 23:38:41 +0000 (16:38 -0700)

Trivial merge