Daniel Wagner-Hall 4d1ea40008 Merge branch 'develop' into redactyoself
Conflicts:
	synapse/handlers/_base.py
2015-08-28 15:35:39 +01:00
..
2015-08-26 13:42:45 +01:00
2015-08-18 11:19:08 +01:00
2015-08-13 16:58:10 +01:00
2015-08-26 13:42:45 +01:00
2015-08-25 16:37:37 +01:00
2015-08-26 11:08:23 +01:00