]> granicus.if.org Git - python/commitdiff
merge 3.4
authorDonald Stufft <donald@stufft.io>
Sun, 14 Aug 2016 20:10:17 +0000 (16:10 -0400)
committerDonald Stufft <donald@stufft.io>
Sun, 14 Aug 2016 20:10:17 +0000 (16:10 -0400)

Trivial merge