James Booth 700ff23188 Merge branch 'master' into osx-functional		2016-01-05 01:46:53 +00:00
..
functionaltests	Merge branch 'master' into osx-functional	2016-01-05 01:35:07 +00:00
unittests	Added roster struct, create and destroy roster on connect/disconnect	2016-01-05 00:06:50 +00:00