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

Trivial merge