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

Trivial merge