]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 26 May 2015 02:24:26 +0000 (21:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 26 May 2015 02:24:26 +0000 (21:24 -0500)

Trivial merge