]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorSteve Dower <steve.dower@microsoft.com>
Wed, 23 Sep 2015 00:35:42 +0000 (17:35 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Wed, 23 Sep 2015 00:35:42 +0000 (17:35 -0700)
1  2 
Lib/platform.py

diff --cc Lib/platform.py
Simple merge