Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 2 May 2009 12:22:41 +0000 (14:22 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 2 May 2009 12:22:41 +0000 (14:22 +0200)
commit671e06bdc5678d2b207112499868803f7111aa3d
tree6c576e99f3b81ba3935a464dd09144395792628e
parent604b8468e10c349abcffaf17b0ab8bdcd91cf3ca
parent6601537f801c3ef3331100a5024e40adc9ce07b1
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk