Merge remote-tracking branch 'origin/master' idea/138.1710
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 19 Aug 2014 13:38:38 +0000 (17:38 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 19 Aug 2014 13:38:38 +0000 (17:38 +0400)

Trivial merge