Merge branch 'master' into develop

This commit is contained in:
Matt Wright
2013-01-06 21:01:53 -05:00
6 changed files with 37 additions and 11 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ copyright = u'2012, Matt Wright'
# built documents.
#
# The short X.Y version.
version = '1.5.2'
version = '1.5.4'
# The full version, including alpha/beta/rc tags.
release = version