Merge branch 'patch-1' of https://github.com/ryenus/intellij-community
authornik <Nikolay.Chashnikov@jetbrains.com>
Thu, 5 May 2016 08:24:22 +0000 (11:24 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Thu, 5 May 2016 08:24:22 +0000 (11:24 +0300)

Trivial merge