Merge branch 'master' into feature/add_jenkins_file

arpeggio/__init__.py

@@ -881,7 +881,7 @@ class NonTerminal(ParseTreeNode, list):
         return self.name
 
     def __str__(self):
-        return " | ".join([str(x) for x in self])
+        return " | ".join([text(x) for x in self])
 
     def __unicode__(self):
         return self.__str__()

setup.py

@@ -12,7 +12,7 @@
 ###############################################################################
 
 __author__ = "Igor R. Dejanović <igor DOT dejanovic AT gmail DOT com>"
-__version__ = "0.11-dev"
+__version__ = "0.12-dev"
 
 from setuptools import setup