]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sun, 9 Dec 2012 15:16:46 +0000 (10:16 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 9 Dec 2012 15:16:46 +0000 (10:16 -0500)

Trivial merge