]> granicus.if.org Git - python/commitdiff
Dummy merge from 3.2, as that approach to resolving #6074 is not applicable to importlib
authorNick Coghlan <ncoghlan@gmail.com>
Fri, 19 Oct 2012 12:58:06 +0000 (22:58 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Fri, 19 Oct 2012 12:58:06 +0000 (22:58 +1000)

Trivial merge