Merge pull request #33 from razamatan/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 15:50:55 +0000 (08:50 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 15:50:55 +0000 (08:50 -0700)
commit18286b6efb3b772d2db04a7ff7fd4c3be764fee0
tree8d092baac052c43df8008e05b56eaaa3c2f8b293
parent086174cd846680d6c4fabdf032450813fa160271
parentef30ab56abc955593879f1348c4097cf956177b7
Merge pull request #33 from razamatan/master

jinja.vim subsumes htmljinja.vim