]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 25 Jan 2014 18:27:53 +0000 (13:27 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 25 Jan 2014 18:27:53 +0000 (13:27 -0500)

Trivial merge