Merge heads

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

Tue, 26 Nov 2013 20:57:10 +0000 (14:57 -0600)

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

Tue, 26 Nov 2013 20:57:10 +0000 (14:57 -0600)
author Zachary Ware <zachary.ware@gmail.com>
Tue, 26 Nov 2013 20:57:10 +0000 (14:57 -0600)
committer Zachary Ware <zachary.ware@gmail.com>
Tue, 26 Nov 2013 20:57:10 +0000 (14:57 -0600)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Zachary Ware <zachary.ware@gmail.com>
	Tue, 26 Nov 2013 20:57:10 +0000 (14:57 -0600)
committer	Zachary Ware <zachary.ware@gmail.com>
	Tue, 26 Nov 2013 20:57:10 +0000 (14:57 -0600)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history