]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sat, 26 Jan 2013 12:58:00 +0000 (13:58 +0100)
committerStefan Krah <skrah@bytereef.org>
Sat, 26 Jan 2013 12:58:00 +0000 (13:58 +0100)

Trivial merge