Merge branch 'master' into win32-x64-working

author nhmall <mjnh@persona.ca>

Fri, 17 Apr 2015 10:34:48 +0000 (06:34 -0400)

committer nhmall <mjnh@persona.ca>

Fri, 17 Apr 2015 10:34:48 +0000 (06:34 -0400)
author nhmall <mjnh@persona.ca>
Fri, 17 Apr 2015 10:34:48 +0000 (06:34 -0400)
committer nhmall <mjnh@persona.ca>
Fri, 17 Apr 2015 10:34:48 +0000 (06:34 -0400)
diff --cc src/allmain.c
Simple merge
diff --cc src/end.c
Simple merge
diff --cc src/restore.c
Simple merge
diff --cc src/save.c
Simple merge
author	nhmall <mjnh@persona.ca>
	Fri, 17 Apr 2015 10:34:48 +0000 (06:34 -0400)
committer	nhmall <mjnh@persona.ca>
	Fri, 17 Apr 2015 10:34:48 +0000 (06:34 -0400)
		1	2
src/allmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/end.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/restore.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/save.c	patch \|	diff1 \|	diff2 \|	blob \| history