Merge with 3.4

author Zachary Ware <zachary.ware@gmail.com>

Fri, 18 Apr 2014 20:45:02 +0000 (15:45 -0500)

committer Zachary Ware <zachary.ware@gmail.com>

Fri, 18 Apr 2014 20:45:02 +0000 (15:45 -0500)
author Zachary Ware <zachary.ware@gmail.com>
Fri, 18 Apr 2014 20:45:02 +0000 (15:45 -0500)
committer Zachary Ware <zachary.ware@gmail.com>
Fri, 18 Apr 2014 20:45:02 +0000 (15:45 -0500)
diff --cc Doc/README.txt
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Zachary Ware <zachary.ware@gmail.com>
	Fri, 18 Apr 2014 20:45:02 +0000 (15:45 -0500)
committer	Zachary Ware <zachary.ware@gmail.com>
	Fri, 18 Apr 2014 20:45:02 +0000 (15:45 -0500)
		1	2
Doc/README.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history