Whitespace cleanup
Merge branch 'master' of github.com:mitsuhiko/jinja2
Added missing versionadded and changelog entry