Merge branch 'master' into develop

This commit is contained in:
Mark Haines 2015-01-08 09:43:48 +00:00
commit 8ac9199f56
3 changed files with 5 additions and 5 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.6.1"
__version__ = "0.6.1a"