]> granicus.if.org Git - python/commitdiff
Issue #23352: Merge from 3.4.
authorStefan Krah <skrah@bytereef.org>
Sun, 1 Feb 2015 18:42:45 +0000 (19:42 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 1 Feb 2015 18:42:45 +0000 (19:42 +0100)

Trivial merge