Merge branch 'master' of neugierig.org:projects/git/ninja
authorEvan Martin <martine@danga.com>
Tue, 8 Feb 2011 18:24:12 +0000 (10:24 -0800)
committerEvan Martin <martine@danga.com>
Tue, 8 Feb 2011 18:24:12 +0000 (10:24 -0800)

Trivial merge