]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 4 Jan 2013 04:34:49 +0000 (20:34 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 4 Jan 2013 04:34:49 +0000 (20:34 -0800)

Trivial merge