Merge pull request #347 (https://github.com/JetBrains/intellij-community/pull/347)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 27 Jan 2016 15:58:47 +0000 (18:58 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 27 Jan 2016 15:58:47 +0000 (18:58 +0300)

Trivial merge