]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 16:15:58 +0000 (12:15 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 16:15:58 +0000 (12:15 -0400)

Trivial merge