]> granicus.if.org Git - python/commitdiff
Merge with 3.6
authorJason R. Coombs <jaraco@jaraco.com>
Sun, 6 Nov 2016 16:16:42 +0000 (11:16 -0500)
committerJason R. Coombs <jaraco@jaraco.com>
Sun, 6 Nov 2016 16:16:42 +0000 (11:16 -0500)

Trivial merge