]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Fri, 17 May 2013 00:38:48 +0000 (19:38 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 17 May 2013 00:38:48 +0000 (19:38 -0500)

Trivial merge