James Booth 6700f9afbb Merge branch 'master' into osx-functional		2015-08-24 00:18:23 +01:00
..
functionaltests	Merge branch 'master' into osx-functional	2015-08-06 01:58:48 +01:00
unittests	Removed unused barejid argument from PGP decryption	2015-08-24 00:13:57 +01:00