]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 31 May 2013 00:00:56 +0000 (01:00 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 31 May 2013 00:00:56 +0000 (01:00 +0100)
commit73c34f5a998bc0bc058d202fa3e9cee62d5684c5
treeb91c0d1ff2c09f45dbaa444cfb9430edba860811
parentde1405fc785e197799b6910c72ac7a25d1e0c6fc
parent147472a27016bfc4e4fdc6985c8f4411a8966e28
Merge branch 'master' of github.com:mitsuhiko/jinja2