Merge branch 'master' of github.com:PetrWolf/ninja
authorPetrWolf <petr.wolf@gmail.com>
Tue, 14 Feb 2012 17:33:04 +0000 (18:33 +0100)
committerPetrWolf <petr.wolf@gmail.com>
Tue, 14 Feb 2012 17:33:04 +0000 (18:33 +0100)

Trivial merge