Mark Haines 33b3e04049 Merge branch 'develop' into daniel/removesomelies
Conflicts:
	synapse/notifier.py
2015-11-04 16:01:00 +00:00
..
2015-10-28 13:45:56 +00:00
2015-11-02 15:10:59 +00:00
2015-10-22 16:17:23 +01:00
2015-08-26 16:03:17 +01:00
2015-11-02 15:31:57 +00:00
2015-08-26 11:08:23 +01:00