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

Trivial merge