Merge branch 'master' into dev

Conflicts:
	docs/changelog.rst
This commit is contained in:
Ross Lawley
2011-10-08 07:33:52 -07:00
2 changed files with 7 additions and 1 deletions

View File

@@ -14,7 +14,7 @@ __all__ = (document.__all__ + fields.__all__ + connection.__all__ +
__author__ = 'Harry Marr'
VERSION = (0, 5, 0)
VERSION = (0, 5, 1)
def get_version():