Merge branch 'master' of github.com:martine/ninja
authorEvan Martin <martine@danga.com>
Wed, 1 Aug 2012 23:13:31 +0000 (16:13 -0700)
committerEvan Martin <martine@danga.com>
Wed, 1 Aug 2012 23:13:31 +0000 (16:13 -0700)
commit649ad87148d5b4998cac7ce82eff29648db02554
treec70b93dbe7b4f68910f2920a178080fbe49ac877
parentd82e806729bed17bf8fba738ed63eb740863c79e
parentff877afa28f8fb1732b8183f1d7a26e16ba39113
Merge branch 'master' of github.com:martine/ninja