]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Mon, 12 Oct 2015 01:05:27 +0000 (18:05 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Mon, 12 Oct 2015 01:05:27 +0000 (18:05 -0700)

Trivial merge