James Booth efda72d60c Merge branch 'master' into plugins ... Conflicts: src/command/command.c		2014-05-20 00:12:00 +01:00
..
mock_otr.c	Merge branch 'master' into plugins	2014-05-20 00:12:00 +01:00
mock_otr.h	Test /otr start sends OTR query message to current recipient	2014-02-23 21:20:41 +00:00