Automated merge with ssh://team@pocoo.org/jinja2-main

author Armin Ronacher <armin.ronacher@active-4.com>

Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)

committer Armin Ronacher <armin.ronacher@active-4.com>

Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
author Armin Ronacher <armin.ronacher@active-4.com>
Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
committer Armin Ronacher <armin.ronacher@active-4.com>
Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
diff --cc docs/api.rst
Simple merge
diff --cc docs/switching.rst
Simple merge
diff --cc docs/templates.rst
Simple merge
author	Armin Ronacher <armin.ronacher@active-4.com>
	Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
committer	Armin Ronacher <armin.ronacher@active-4.com>
	Mon, 12 May 2008 23:03:17 +0000 (01:03 +0200)
		1	2
docs/api.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/switching.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates.rst	patch \|	diff1 \|	diff2 \|	blob \| history