Merge branch 'master' into sprint-branch

diff --cc CHANGES
index 95fd4823accec856e3fc3626fda218db9a36ef80,6a4420dcdbe17904e152fe9b06a06b517371100a..e4aa398c149ab018e968ab250e95a89a0aa03e8e
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -15,9 -15,9 +15,11 @@@ Version 2.
    want to change this encoding they can override the filter.
  - Accessing `last` on the loop context no longer causes the iterator
    to be consumed into a list.
 +- Python requirement changed: 2.6, 2.7 or >= 3.3 are required now,
 +  supported by same source code, using the "six" compatibility library.
  - Allow `contextfunction` and other decorators to be applied to `__call__`.
+ - Added support for changing from newline to different signs in the `wordwrap`
+   filter.
  
  Version 2.6
  -----------

diff --cc jinja2/filters.py
Simple merge