]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorMartin Panter <vadmium+py@gmail.com>
Thu, 17 Dec 2015 10:35:05 +0000 (10:35 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Thu, 17 Dec 2015 10:35:05 +0000 (10:35 +0000)

Trivial merge