]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23042)
authorBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2015 01:32:36 +0000 (21:32 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2015 01:32:36 +0000 (21:32 -0400)

Trivial merge