James Booth 5b74c59ad7 Merge branch 'master' into osx-functional		2015-11-01 22:05:47 +00:00
..
functionaltests	Merge branch 'master' into osx-functional	2015-10-18 03:11:18 +01:00
unittests	Renamed ui_room_hide_occupants -> mucwin_hide_occupants	2015-11-01 21:57:57 +00:00