Merge branch 'master' into development

defunkt · Jun 29, 2012 · 50204d4 · 50204d4
2 parents 85c6276 + b8a3d0c
commit 50204d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pystache/__init__.py b/pystache/__init__.py
@@ -10,4 +10,4 @@
 
 __all__ = ['parse', 'render', 'Renderer', 'TemplateSpec']
 
-__version__ = '0.5.2-rc.1'  # Also change in setup.py.
+__version__ = '0.5.2'  # Also change in setup.py.
diff --git a/setup.py b/setup.py
@@ -97,7 +97,7 @@
     setup = dist.setup
 
 
-VERSION = '0.5.2-rc.1'  # Also change in pystache/__init__.py.
+VERSION = '0.5.2'  # Also change in pystache/__init__.py.
 
 FILE_ENCODING = 'utf-8'