Issue #20265: Merge with 3.3

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

Fri, 17 Jan 2014 21:24:18 +0000 (15:24 -0600)

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

Fri, 17 Jan 2014 21:24:18 +0000 (15:24 -0600)
author Zachary Ware <zachary.ware@gmail.com>
Fri, 17 Jan 2014 21:24:18 +0000 (15:24 -0600)
committer Zachary Ware <zachary.ware@gmail.com>
Fri, 17 Jan 2014 21:24:18 +0000 (15:24 -0600)
diff --cc Doc/using/windows.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Zachary Ware <zachary.ware@gmail.com>
	Fri, 17 Jan 2014 21:24:18 +0000 (15:24 -0600)
committer	Zachary Ware <zachary.ware@gmail.com>
	Fri, 17 Jan 2014 21:24:18 +0000 (15:24 -0600)
		1	2
Doc/using/windows.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history