James Booth 12417828fa Merge branch 'master' into osx-functional		2015-11-19 00:45:57 +00:00
..
functionaltests	Merge branch 'master' into osx-functional	2015-10-18 03:11:18 +01:00
unittests	Pass offline filter to roster_get_contacts	2015-11-18 01:03:35 +00:00