Merge branch 'master' into nhmall-booktribute

author nhmall <mjnh@persona.ca>

Fri, 10 Apr 2015 16:15:14 +0000 (12:15 -0400)

committer nhmall <mjnh@persona.ca>

Fri, 10 Apr 2015 16:15:14 +0000 (12:15 -0400)
author nhmall <mjnh@persona.ca>
Fri, 10 Apr 2015 16:15:14 +0000 (12:15 -0400)
committer nhmall <mjnh@persona.ca>
Fri, 10 Apr 2015 16:15:14 +0000 (12:15 -0400)
diff --cc doc/fixes35.0
Simple merge
diff --cc include/extern.h
Simple merge
diff --cc src/do_name.c
Simple merge
diff --cc src/files.c
Simple merge
diff --cc src/objnam.c
Simple merge
diff --cc src/read.c
Simple merge
diff --cc sys/unix/Makefile.top
Simple merge
author	nhmall <mjnh@persona.ca>
	Fri, 10 Apr 2015 16:15:14 +0000 (12:15 -0400)
committer	nhmall <mjnh@persona.ca>
	Fri, 10 Apr 2015 16:15:14 +0000 (12:15 -0400)
		1	2
doc/fixes35.0	patch \|	diff1 \|	diff2 \|	blob \| history
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/do_name.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/files.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/objnam.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/read.c	patch \|	diff1 \|	diff2 \|	blob \| history
sys/unix/Makefile.top	patch \|	diff1 \|	diff2 \|	blob \| history