]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 296b21a d388c4e)
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Sep 2012 15:03:27 +0000 (11:03 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Sep 2012 15:03:27 +0000 (11:03 -0400)
1  2 
Lib/test/test_import.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_import.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.