Mark Haines 2a0ec3b89d Merge branch 'develop' into markjh/edu_frequency
Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py
2015-12-02 10:40:22 +00:00
..
2015-10-28 13:45:56 +00:00
2015-11-19 10:07:21 -05:00
2015-11-19 15:16:25 +00:00