]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 01:18:29 +0000 (20:18 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 01:18:29 +0000 (20:18 -0500)
1  2 
Lib/site.py
Lib/test/test_site.py

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