Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/community
authorAleksandr Samofalov <aleksandr.samofalov@jetbrains.com>
Mon, 4 Apr 2016 15:37:46 +0000 (18:37 +0300)
committerAleksandr Samofalov <aleksandr.samofalov@jetbrains.com>
Mon, 4 Apr 2016 15:37:46 +0000 (18:37 +0300)

Trivial merge