]> granicus.if.org Git - python/commitdiff
merge 3.3 (#20272)
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 Jan 2014 15:10:26 +0000 (10:10 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 Jan 2014 15:10:26 +0000 (10:10 -0500)

Trivial merge