]> granicus.if.org Git - python/commitdiff
Merge 3.5.
authorStefan Krah <skrah@bytereef.org>
Wed, 3 Aug 2016 09:18:54 +0000 (11:18 +0200)
committerStefan Krah <skrah@bytereef.org>
Wed, 3 Aug 2016 09:18:54 +0000 (11:18 +0200)

Trivial merge