Merge remote-tracking branch 'origin/master' appcode/142.4913 dbe/142.4909 idea/142.4911 phpstorm/142.4912 pycharm/142.4908 rubymine/142.4915 webstorm/142.4918
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 15 Sep 2015 21:55:24 +0000 (00:55 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 15 Sep 2015 21:55:24 +0000 (00:55 +0300)

Trivial merge