Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 15 Sep 2015 18:36:56 +0000 (20:36 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 15 Sep 2015 18:36:56 +0000 (20:36 +0200)

Trivial merge