]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
Merge remote-tracking branch 'kadams54/master'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:04:40 +0000 (11:04 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:04:40 +0000 (11:04 +0100)
1  2 
jinja2/bccache.py

Simple merge