Merge branch 'master' into next

docs/source/changes.rst

@@ -1,3 +1,13 @@
+0.2.2
+=====
+* Unobfuscate syntax highlighting JavaScript for debian packaging.
+* Extract the scaffold-building tests into tox.
+* Add support for specifying a pecan configuration file via the
+  ``PECAN_CONFIG``
+  environment variable.
+* Fix a bug in ``DELETE`` methods in two (or more) nested ``RestControllers``.
+* Add documentation for returning specific HTTP status codes.
+
 0.2.1
 =====
 

docs/source/conf.py

@@ -49,9 +49,9 @@ copyright = u'2010, Jonathan LaCour'
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.1'
+version = '0.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.1'
+release = '0.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,7 @@ import sys
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 
-version = '0.2.1'
+version = '0.2.2'
 
 #
 # determine requirements