]> granicus.if.org Git - python/commitdiff
Merge from 3.3.
authorStefan Krah <skrah@bytereef.org>
Sat, 4 Jan 2014 12:06:59 +0000 (13:06 +0100)
committerStefan Krah <skrah@bytereef.org>
Sat, 4 Jan 2014 12:06:59 +0000 (13:06 +0100)

Trivial merge