Merge with 3.3

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

Wed, 26 Feb 2014 16:41:40 +0000 (10:41 -0600)

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

Wed, 26 Feb 2014 16:41:40 +0000 (10:41 -0600)
author Zachary Ware <zachary.ware@gmail.com>
Wed, 26 Feb 2014 16:41:40 +0000 (10:41 -0600)
committer Zachary Ware <zachary.ware@gmail.com>
Wed, 26 Feb 2014 16:41:40 +0000 (10:41 -0600)
diff --cc Doc/c-api/exceptions.rst
Simple merge
diff --cc Doc/c-api/module.rst
Simple merge
diff --cc Doc/c-api/typeobj.rst
Simple merge
author	Zachary Ware <zachary.ware@gmail.com>
	Wed, 26 Feb 2014 16:41:40 +0000 (10:41 -0600)
committer	Zachary Ware <zachary.ware@gmail.com>
	Wed, 26 Feb 2014 16:41:40 +0000 (10:41 -0600)
		1	2
Doc/c-api/exceptions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/c-api/module.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/c-api/typeobj.rst	patch \|	diff1 \|	diff2 \|	blob \| history