]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sat, 22 Dec 2012 13:24:55 +0000 (14:24 +0100)
committerStefan Krah <skrah@bytereef.org>
Sat, 22 Dec 2012 13:24:55 +0000 (14:24 +0100)

Trivial merge