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

Trivial merge