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

Trivial merge