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

Trivial merge