]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Thu, 31 Oct 2013 05:21:06 +0000 (01:21 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 31 Oct 2013 05:21:06 +0000 (01:21 -0400)

Trivial merge