Merge remote-tracking branch 'origin/master' rubymine/138.1466
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 4 Aug 2014 10:17:14 +0000 (14:17 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 4 Aug 2014 10:17:14 +0000 (14:17 +0400)

Trivial merge