Merge remote-tracking branch 'origin/master' idea/138.1619
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 13 Aug 2014 12:16:53 +0000 (16:16 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 13 Aug 2014 12:16:53 +0000 (16:16 +0400)

Trivial merge