]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Mon, 23 Nov 2015 02:20:37 +0000 (18:20 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Mon, 23 Nov 2015 02:20:37 +0000 (18:20 -0800)

Trivial merge