]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 15 Mar 2014 20:24:10 +0000 (15:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 15 Mar 2014 20:24:10 +0000 (15:24 -0500)

Trivial merge