Merge remote-tracking branch 'origin/master' clion/140.128 dbe/140.127 idea/140.122 phpstorm/140.126 pycharm/140.123 rubymine/140.124 webstorm/140.125
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 14 Oct 2014 19:35:59 +0000 (23:35 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 14 Oct 2014 19:35:59 +0000 (23:35 +0400)

Trivial merge