From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 11:07:34 +0000 (+0100)
Subject: Merge branch 'master' into sprint-branch
X-Git-Tag: 2.7~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2fc8749bcb4f9fdc8e26a00bc91ab801166d2af;p=thirdparty%2Fjinja.git

Merge branch 'master' into sprint-branch
---

e2fc8749bcb4f9fdc8e26a00bc91ab801166d2af
diff --cc CHANGES
index 95fd4823,6a4420dc..e4aa398c
--- a/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
  -----------