]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Fri, 21 Dec 2012 22:23:25 +0000 (23:23 +0100)
committerStefan Krah <skrah@bytereef.org>
Fri, 21 Dec 2012 22:23:25 +0000 (23:23 +0100)

Trivial merge