From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 24 May 2011 15:50:55 +0000 (-0700)
Subject: Merge pull request #33 from razamatan/master
X-Git-Tag: 2.6~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18286b6efb3b772d2db04a7ff7fd4c3be764fee0;p=jinja2.git

Merge pull request #33 from razamatan/master

jinja.vim subsumes htmljinja.vim
---

18286b6efb3b772d2db04a7ff7fd4c3be764fee0