Allow choice of wrap string in wordwrap filter.
Merge pull request #206 from johnmcdonnell/wordwrap

Allow choice of wrap string in wordwrap filter.
Merge branch 'master' of github.com:mitsuhiko/jinja2
Added missing versionadded and changelog entry
Merge branch 'master' into sprint-branch