Mark Haines 3b390bff3c Merge branch 'master' into markjh/room_tags ... Conflicts: api/client-server/v1/rooms.yaml specification/targets.yaml		2015-11-16 16:56:35 +00:00
..
v1	Merge branch 'master' into markjh/client_config	2015-11-16 16:51:45 +00:00