commit d34eb125c3f9b05ea12c7c3a767cd668b791334d
author Armin Ronacher <armin.ronacher@active-4.com> Mon Oct 13 23:47:51 2008 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> Mon Oct 13 23:47:51 2008 +0200
tree aa79d4b8e43fe3aa43310a4ac94c004a207fe847
parent ccae0559b4ab43be063b34cc0f0d95106173d284

Implemented and documented "joiner"

--HG--
branch : trunk

jinja2/defaults.py

diff --git a/jinja2/defaults.py b/jinja2/defaults.py
index 61706ae..3e24e7d 100644
--- a/jinja2/defaults.py
+++ b/jinja2/defaults.py
@@ -8,7 +8,7 @@
     :copyright: 2007-2008 by Armin Ronacher.
     :license: BSD, see LICENSE for more details.
 """
-from jinja2.utils import generate_lorem_ipsum, Cycler
+from jinja2.utils import generate_lorem_ipsum, Cycler, Joiner
 
 
 # defaults for the parser / lexer
@@ -30,7 +30,8 @@
     'range':        xrange,
     'dict':         lambda **kw: kw,
     'lipsum':       generate_lorem_ipsum,
-    'cycler':       Cycler
+    'cycler':       Cycler,
+    'joiner':       Joiner
 }