Merge remote-tracking branch 'origin/master' appcode/142.313 clion/142.306 dbe/142.310 idea/142.312 pycharm/142.318 rubymine/142.307 webstorm/142.309
authorSergey Malenkov <sergey.malenkov@jetbrains.com>
Tue, 17 Mar 2015 19:32:51 +0000 (22:32 +0300)
committerSergey Malenkov <sergey.malenkov@jetbrains.com>
Tue, 17 Mar 2015 19:32:51 +0000 (22:32 +0300)

Trivial merge