Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 5 Sep 2014 23:33:47 +0000 (01:33 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 5 Sep 2014 23:33:47 +0000 (01:33 +0200)

Trivial merge