]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorBrian Curtin <brian@python.org>
Wed, 1 Feb 2012 21:15:14 +0000 (15:15 -0600)
committerBrian Curtin <brian@python.org>
Wed, 1 Feb 2012 21:15:14 +0000 (15:15 -0600)
1  2 
Doc/library/platform.rst
Lib/platform.py

Simple merge
diff --cc Lib/platform.py
Simple merge