James Booth 37353edf98 Merge branch 'master' into xep0308-last-message-correction ... Conflicts: src/command/cmd_ac.c src/command/cmd_defs.c		2017-04-29 23:01:09 +01:00
..
functionaltests	Add carbons from check	2017-01-23 22:25:36 +00:00
unittests	Merge branch 'master' into xep0308-last-message-correction	2017-04-29 23:01:09 +01:00