James Booth c813bed160 Merge branch 'master' into osx-functional		2016-05-31 23:29:24 +01:00
..
functionaltests	Merge branch 'master' into osx-functional	2016-05-01 20:25:36 +01:00
unittests	Move /statuses options to /presence command	2016-05-31 23:21:19 +01:00