]> granicus.if.org Git - python/commitdiff
Merge 3.6.
authorStefan Krah <skrah@bytereef.org>
Sun, 8 Jan 2017 00:11:50 +0000 (01:11 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 8 Jan 2017 00:11:50 +0000 (01:11 +0100)

Trivial merge