Merge branch 'releases/2.1.5'

weierophinney · weierophinney · commit e0f4b368f6cb · 2013-04-17T10:12:00.000-05:00
2.1.5 readiness
diff --git a/docs/languages/en/conf.py b/docs/languages/en/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.0dev'
+release = '2.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
