Merge from 3.3 (Issue #15209)

author Nick Coghlan <ncoghlan@gmail.com>

Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)

committer Nick Coghlan <ncoghlan@gmail.com>

Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
author Nick Coghlan <ncoghlan@gmail.com>
Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
committer Nick Coghlan <ncoghlan@gmail.com>
Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
diff --cc Doc/library/exceptions.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
		1	2
Doc/library/exceptions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history