merge changesets from stable branch

author Michael Elkins <me@sigpipe.org>

Wed, 23 Oct 2013 18:20:24 +0000 (11:20 -0700)

committer Michael Elkins <me@sigpipe.org>

Wed, 23 Oct 2013 18:20:24 +0000 (11:20 -0700)
author Michael Elkins <me@sigpipe.org>
Wed, 23 Oct 2013 18:20:24 +0000 (11:20 -0700)
committer Michael Elkins <me@sigpipe.org>
Wed, 23 Oct 2013 18:20:24 +0000 (11:20 -0700)
diff --cc mutt.h
Simple merge
diff --cc postpone.c
Simple merge
author	Michael Elkins <me@sigpipe.org>
	Wed, 23 Oct 2013 18:20:24 +0000 (11:20 -0700)
committer	Michael Elkins <me@sigpipe.org>
	Wed, 23 Oct 2013 18:20:24 +0000 (11:20 -0700)
		1	2
mutt.h	patch \|	diff1 \|	diff2 \|	blob \| history
postpone.c	patch \|	diff1 \|	diff2 \|	blob \| history