]> granicus.if.org Git - python/commitdiff
Merge from 3.5; no changes to 3.6
authorMartin Panter <vadmium+py@gmail.com>
Wed, 8 Jun 2016 12:45:30 +0000 (12:45 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Wed, 8 Jun 2016 12:45:30 +0000 (12:45 +0000)

Trivial merge