Merge branch 'PY-15074' of git.labs.intellij.net:idea/community into PY-15074
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 17 Apr 2015 19:53:54 +0000 (22:53 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 17 Apr 2015 19:53:54 +0000 (22:53 +0300)
commitf2f8b17ea078df15c91262e7b0b953f255e92ed6
tree95f2111aefab598b90cd3664a5ad86a823c7c760
parent2cdd1254bb39a9efee519daaa6528a387ddb141a
parentfb0bd12b015a0fac74bea8806583806657af6053
Merge branch 'PY-15074' of git.labs.intellij.net:idea/community into PY-15074