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
..
stub_ui.c	Merge branch 'master' into xep0308-last-message-correction	2017-04-29 23:01:09 +01:00
stub_ui.h	Remove ui_current_print_formatted_line	2016-10-16 22:13:49 +01:00