Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
commita11366ec44e577c39106f3de9eb371caab0233e9
tree26bc33ba3f64dcec82e367bd218ea9daaf98596e
parent0a2ac69bb97370591306f396b693b93af67726fd
parent3863b6583d68495addf693fac7a741479fff5fde
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk
docs/api.rst
docs/switching.rst
docs/templates.rst