Merge branches 'master' and 'pycharm/folding' of git.labs.intellij.net:idea/community appcode/144.2283 appcode/144.2294 clion/144.2284 clion/144.2293 dbe/144.2282 idea/144.2285 phpstorm/144.2280 pycharm/144.2289 rubymine/144.2288 webstorm/144.2290
authorliana.bakradze <liana.bakradze@jetbrains.com>
Thu, 17 Dec 2015 19:06:06 +0000 (21:06 +0200)
committerliana.bakradze <liana.bakradze@jetbrains.com>
Thu, 17 Dec 2015 19:06:06 +0000 (21:06 +0200)
commite206252b6f519b9c900cc496043eccf9a989177e
tree8135153357d0fa7055cdb2410539eb5ce8aafc8c
parent8256c80804eff5d3a03a7467df32e32540daad0c
parent71771ed6a333e79f07f7d49a6eadf20fc0a62a04
Merge branches 'master' and 'pycharm/folding' of git.labs.intellij.net:idea/community

# Conflicts:
# python/src/META-INF/python-core.xml
python/src/META-INF/python-core.xml