From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 19 May 2013 10:33:59 +0000 (-0700)
Subject: Merge pull request #76 from kracekumar/master
X-Git-Tag: 2.7~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6892c583ba0c121c0b8cda7c8874e9876f992f3;p=thirdparty%2Fjinja.git

Merge pull request #76 from kracekumar/master

Changed three to four in nodes.py at line no 107
---

d6892c583ba0c121c0b8cda7c8874e9876f992f3
diff --cc jinja2/nodes.py
index c14f8e38,c827e2b3..7e5229e0
--- a/jinja2/nodes.py
+++ b/jinja2/nodes.py
@@@ -103,9 -102,9 +103,9 @@@ def get_eval_context(node, ctx)
      return ctx
  
  
 -class Node(object):
 +class Node(six.with_metaclass(NodeType, object)):
      """Baseclass for all Jinja2 nodes.  There are a number of nodes available
-     of different types.  There are three major types:
+     of different types.  There are four major types:
  
      -   :class:`Stmt`: statements
      -   :class:`Expr`: expressions