merge 3.4 (#24096)

author Benjamin Peterson <benjamin@python.org>

Sun, 3 May 2015 15:29:58 +0000 (11:29 -0400)

committer Benjamin Peterson <benjamin@python.org>

Sun, 3 May 2015 15:29:58 +0000 (11:29 -0400)
author Benjamin Peterson <benjamin@python.org>
Sun, 3 May 2015 15:29:58 +0000 (11:29 -0400)
committer Benjamin Peterson <benjamin@python.org>
Sun, 3 May 2015 15:29:58 +0000 (11:29 -0400)
diff --cc Lib/test/test_warnings.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Python/_warnings.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Sun, 3 May 2015 15:29:58 +0000 (11:29 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Sun, 3 May 2015 15:29:58 +0000 (11:29 -0400)
		1	2
Lib/test/test_warnings.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/_warnings.c	patch \|	diff1 \|	diff2 \|	blob \| history