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)
commitfc11164224031d12c8711a688052cd5ae45e20e2
tree174a97522087cacc9c1a00ba57e5757dfaa33448
parent6ccfcffc5d0a879bbf95c3a0562a7268d4ca03df
parent450c7a914e237bee4c95154a47e23f03fc4053a7
Merge branch 'patch-1' of https://github.com/ryenus/intellij-community