summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-06-29 05:11:53 -0700
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-06-29 05:12:13 -0700
commit50204d45cc00ca5c075090a2ae5fb1b696ed9be7 (patch)
treed5ef8af635f7af488b7c594f9b3f062d09ac331b
parent85c6276695a8707c30b67e0e20ee2e26f7de14f1 (diff)
parentb8a3d0c6cea62874bac2414db2c06856293d8877 (diff)
downloadpystache-50204d45cc00ca5c075090a2ae5fb1b696ed9be7.tar.gz
Merge branch 'master' into development
-rw-r--r--pystache/__init__.py2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pystache/__init__.py b/pystache/__init__.py
index b81e912..fa0b241 100644
--- a/pystache/__init__.py
+++ b/pystache/__init__.py
@@ -10,4 +10,4 @@ from pystache.init import parse, render, Renderer, TemplateSpec
__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
index aa87cee..215d30f 100644
--- a/setup.py
+++ b/setup.py
@@ -97,7 +97,7 @@ else:
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'