]> granicus.if.org Git - python/commitdiff
Merge from 3.4 into 3.5; no file changes
authorMartin Panter <vadmium+py@gmail.com>
Mon, 28 Sep 2015 06:28:29 +0000 (06:28 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Mon, 28 Sep 2015 06:28:29 +0000 (06:28 +0000)

Trivial merge