tree 7123b1e50ab7228a4fc2b3f224bd741409e0c439
parent e9e43bbabc4e98c4e6f2add5f02f17ae69068cfd
parent 62f8a2984c8b2ffc712ae7bbed6cf4e59eaa2dbe
author Christoph Hack <christoph@tux21b.org> 1208122622 +0200
committer Christoph Hack <christoph@tux21b.org> 1208122622 +0200

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

--HG--
branch : trunk