]> granicus.if.org Git - python/commitdiff
merge 3.3 (#18565)
authorBenjamin Peterson <benjamin@python.org>
Sat, 27 Jul 2013 21:07:19 +0000 (14:07 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 27 Jul 2013 21:07:19 +0000 (14:07 -0700)

Trivial merge