Merge branch 'issue11' into devel

Conflicts:
	docs/source/introduction.rst
This commit is contained in:
jevans 2013-06-05 20:46:10 -04:00
commit 56e76aac03
11 changed files with 667 additions and 61 deletions

View file

@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
# The short X.Y version.
version = '0.1'
# The full version, including alpha/beta/rc tags.
release = '0.1.3p1'
release = '0.1.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.