1302 Commits (e5801db8305d548be2f2210366d185aef4e53127)

Author	SHA1	Message	Date
David Baker	5c6189ea3e	Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py	2015-01-22 17:46:16 +00:00
Mark Haines	97c68c508d	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00