]> granicus.if.org Git - python/commitdiff
merge 3.2 (#13766)
authorBenjamin Peterson <benjamin@python.org>
Mon, 16 Jan 2012 02:28:13 +0000 (21:28 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 16 Jan 2012 02:28:13 +0000 (21:28 -0500)

Trivial merge