Merge branch 'master' of git.labs.intellij.net:idea/community
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 25 Feb 2015 14:31:17 +0000 (15:31 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 25 Feb 2015 14:31:17 +0000 (15:31 +0100)

Trivial merge