]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sun, 20 Jan 2013 22:19:22 +0000 (23:19 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 20 Jan 2013 22:19:22 +0000 (23:19 +0100)

Trivial merge