]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sat, 1 Mar 2014 07:03:57 +0000 (02:03 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 1 Mar 2014 07:03:57 +0000 (02:03 -0500)

Trivial merge