Merge branch 'master' into win32-x64-working

author nhmall <mjnh@persona.ca>

Mon, 4 May 2015 21:56:35 +0000 (17:56 -0400)

committer nhmall <mjnh@persona.ca>

Mon, 4 May 2015 21:56:35 +0000 (17:56 -0400)
author nhmall <mjnh@persona.ca>
Mon, 4 May 2015 21:56:35 +0000 (17:56 -0400)
committer nhmall <mjnh@persona.ca>
Mon, 4 May 2015 21:56:35 +0000 (17:56 -0400)
diff --cc include/config.h
Simple merge
diff --cc src/do.c
Simple merge
author	nhmall <mjnh@persona.ca>
	Mon, 4 May 2015 21:56:35 +0000 (17:56 -0400)
committer	nhmall <mjnh@persona.ca>
	Mon, 4 May 2015 21:56:35 +0000 (17:56 -0400)
		1	2
include/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/do.c	patch \|	diff1 \|	diff2 \|	blob \| history