]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sun, 23 Dec 2012 14:46:03 +0000 (15:46 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 23 Dec 2012 14:46:03 +0000 (15:46 +0100)

Trivial merge