]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 4 Apr 2014 13:51:45 +0000 (09:51 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 4 Apr 2014 13:51:45 +0000 (09:51 -0400)

Trivial merge