Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)
commit8a05e937cca3f5da09e482adb9821e3fb266b6cc
treec0ac09b4d0c3282af0425923fc664d216c324dc4
parentff115c4e7b2015604fb19a9528e936277cabad15
parentb523c9320292e2f8dab1f4a6c21878a52481d117
Merge branch 'master' of github.com:mitsuhiko/jinja2