]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 5 Dec 2015 08:27:23 +0000 (00:27 -0800)
committerBenjamin Peterson <benjamin@python.org>
Sat, 5 Dec 2015 08:27:23 +0000 (00:27 -0800)

Trivial merge