Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/commu... appcode/146.614
authorAleksandr <aleksandr.samofalov@jetbrains.com>
Thu, 3 Mar 2016 16:00:06 +0000 (19:00 +0300)
committerAleksandr <aleksandr.samofalov@jetbrains.com>
Thu, 3 Mar 2016 16:00:06 +0000 (19:00 +0300)

Trivial merge