Merge pull request #400 from neomutt/devel/issue-336

author Pierre-Elliott Bécue <P-EB@users.noreply.github.com>

Wed, 15 Feb 2017 09:14:13 +0000 (10:14 +0100)

committer GitHub <noreply@github.com>

Wed, 15 Feb 2017 09:14:13 +0000 (10:14 +0100)
author Pierre-Elliott Bécue <P-EB@users.noreply.github.com>
Wed, 15 Feb 2017 09:14:13 +0000 (10:14 +0100)
committer GitHub <noreply@github.com>
Wed, 15 Feb 2017 09:14:13 +0000 (10:14 +0100)
diff --cc browser.c
Simple merge
diff --cc compose.c
Simple merge
author	Pierre-Elliott Bécue <P-EB@users.noreply.github.com>
	Wed, 15 Feb 2017 09:14:13 +0000 (10:14 +0100)
committer	GitHub <noreply@github.com>
	Wed, 15 Feb 2017 09:14:13 +0000 (10:14 +0100)
		1	2
browser.c	patch \|	diff1 \|	diff2 \|	blob \| history
compose.c	patch \|	diff1 \|	diff2 \|	blob \| history