Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 13 Sep 2011 21:35:34 +0000 (23:35 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 13 Sep 2011 21:35:34 +0000 (23:35 +0200)
commitec9e8eb7937f1ac6c6912f2b2bf18644bd1bbf00
tree12c8832d54278943c73469fab95f0b2e98ca6e85
parent6fa6cb0e129893b0166448563597e1d156cd8746
parent6336e770b9434781157df62f555da5c15a1b2629
Merge branch 'master' of github.com:mitsuhiko/jinja2
CHANGES