Merge branch 'stable/1.7.X'

We fork at beta. This branch will be recreated when the first beta is created.
It has been merged in to maintain the version number bump and tag.
This commit is contained in:
Marc Tamlyn 2014-01-23 20:21:11 +00:00
commit 89df51803e
1 changed files with 1 additions and 1 deletions

View File

@ -1,4 +1,4 @@
VERSION = (1, 7, 0, 'alpha', 0)
VERSION = (1, 7, 0, 'alpha', 1)
def get_version(*args, **kwargs):