Merge remote-tracking branch 'origin/master' appcode/142.1880 clion/142.1874 dbe/142.1868 pycharm/142.1877 webstorm/142.1872
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 19 May 2015 21:00:40 +0000 (23:00 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 19 May 2015 21:00:40 +0000 (23:00 +0200)

Trivial merge