Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)
commitd01d34b1a127432f4e42fce7cd7bbb3f17cf10ad
tree22995e8e7ad976895fe61ea16a167d691695787b
parentee352ec21fdf753eff85e5d02631567d8c45a6d0
parente37f697754987d3e8db0521263220a4f357aac30
Merge branch 'master' of github.com:mitsuhiko/jinja2