]> granicus.if.org Git - python/commitdiff
Dummy merge with 3.5
authorMartin Panter <vadmium+py@gmail.com>
Fri, 26 Feb 2016 00:42:33 +0000 (00:42 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Fri, 26 Feb 2016 00:42:33 +0000 (00:42 +0000)

Trivial merge