Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 10 Sep 2014 13:08:47 +0000 (15:08 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 10 Sep 2014 13:08:47 +0000 (15:08 +0200)

Trivial merge