Merge branch '2.5-maintenance'
[jinja2.git] / jinja2 / _markupsafe /
2010-08-17 Armin RonacherMerged in ronny's fixes for round filter
2010-08-17 Armin RonacherPulled in code from markupsafe
2010-08-17 Armin RonacherMarkupSafe is now used for the Jinja2 speedups