]> granicus.if.org Git - python/commitdiff
merge 3.2 (#23130)
authorBenjamin Peterson <benjamin@python.org>
Tue, 30 Dec 2014 16:08:52 +0000 (10:08 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 30 Dec 2014 16:08:52 +0000 (10:08 -0600)

Trivial merge