]> granicus.if.org Git - python/commitdiff
Closes #23956: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Tue, 14 Apr 2015 20:46:22 +0000 (15:46 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 14 Apr 2015 20:46:22 +0000 (15:46 -0500)
1  2 
Lib/imp.py

diff --cc Lib/imp.py
Simple merge