Merge branch 'master' into 'development': changes for v0.5.1 prep.

Conflicts:
	HISTORY.rst

HISTORY.rst

@@ -6,8 +6,8 @@ History
 
 * Falsey values now coerced to strings using str().
 
-0.5.1 (2012-04-03)
------------
+0.5.1 (2012-04-24)
+------------------
 
 * Added support for Python 3.1 and 3.2.
 * Added tox support to test multiple Python versions.

README.rst

@@ -211,7 +211,6 @@ Author
 .. _Mustache: http://mustache.github.com/
 .. _Mustache spec: https://github.com/mustache/spec
 .. _mustache(5): http://mustache.github.com/mustache.5.html
-.. _nose: http://readthedocs.org/docs/nose/en/latest/
 .. _only unicode strings: http://docs.python.org/howto/unicode.html#tips-for-writing-unicode-aware-programs
 .. _PyPI: http://pypi.python.org/pypi/pystache
 .. _Pystache: https://github.com/defunkt/pystache

pystache/__init__.py

@@ -10,4 +10,4 @@ from pystache.init import render, Renderer, TemplateSpec
 
 __all__ = ['render', 'Renderer', 'TemplateSpec']
 
-__version__ = '0.5.1-rc'  # Also change in setup.py.
+__version__ = '0.5.1'  # Also change in setup.py.

setup.py

@@ -56,7 +56,7 @@ else:
 # print("Using: version %s of %s" % (repr(dist.__version__), repr(dist)))
 
 
-VERSION = '0.5.1-rc'  # Also change in pystache/__init__.py.
+VERSION = '0.5.1'  # Also change in pystache/__init__.py.
 
 HISTORY_PATH = 'HISTORY.rst'
 LICENSE_PATH = 'LICENSE'