]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Mon, 1 Oct 2012 21:30:32 +0000 (23:30 +0200)
committerStefan Krah <skrah@bytereef.org>
Mon, 1 Oct 2012 21:30:32 +0000 (23:30 +0200)

Trivial merge