Merge branch 'fix-provide-form' of git://github.com/yasuyk/ninja
authorEvan Martin <martine@danga.com>
Tue, 21 Jan 2014 18:57:29 +0000 (10:57 -0800)
committerEvan Martin <martine@danga.com>
Tue, 21 Jan 2014 18:57:29 +0000 (10:57 -0800)
commit8d42584c29f0eb2e955870db2805335460763282
tree044aa8b7ca511094fe39312d1c06dad0569e76af
parent51c9220f533d61020e789a07d09456d7d59c101a
parent9da5b0c862326c837e7d131fadcd8866d9053922
Merge branch 'fix-provide-form' of git://github.com/yasuyk/ninja

Conflicts:
misc/ninja-mode.el
misc/ninja-mode.el