]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Sun, 15 Apr 2012 19:25:10 +0000 (15:25 -0400)
committerBrett Cannon <brett@python.org>
Sun, 15 Apr 2012 19:25:10 +0000 (15:25 -0400)
1  2 
Lib/importlib/_bootstrap.py

Simple merge