Merge remote-tracking branch 'origin/master' appcode/140.1228 appcode/140.1242 clion/140.1231 clion/140.1243 idea/140.1240 phpstorm/140.1237 pycharm/140.1230 pycharm/140.1239 rubymine/140.1241 webstorm/140.1232 webstorm/140.1234
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sat, 20 Dec 2014 02:09:07 +0000 (03:09 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sat, 20 Dec 2014 02:09:07 +0000 (03:09 +0100)

Trivial merge