]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sun, 16 Dec 2012 20:11:35 +0000 (21:11 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 16 Dec 2012 20:11:35 +0000 (21:11 +0100)

Trivial merge