c39b333631
Conflicts: compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
Conflicts: compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java