]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' into sprint-branch
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:44:48 +0000 (12:44 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:44:48 +0000 (12:44 +0100)
commit64f6990c3b711f8ff26530c27bb0913213564e50
treebb66e3d849ca76179c7aea00322def08a321b642
parent5447aa736a54da4a7e6115bb63a324b122fd3d06
parent6c9e5aee4b1fe47c77168a7f974d127756c619a6
Merge branch 'master' into sprint-branch