Merge remote-tracking branch 'origin/master' webstorm/140.2396
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 Feb 2015 12:00:48 +0000 (13:00 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 Feb 2015 12:00:48 +0000 (13:00 +0100)

Trivial merge