]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 1 Feb 2015 23:02:15 +0000 (18:02 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 1 Feb 2015 23:02:15 +0000 (18:02 -0500)

Trivial merge