Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/commu... appcode/146.184 appcode/146.332
authorAleksandr <aleksandr.samofalov@jetbrains.com>
Thu, 25 Feb 2016 16:05:31 +0000 (19:05 +0300)
committerAleksandr <aleksandr.samofalov@jetbrains.com>
Thu, 25 Feb 2016 16:05:31 +0000 (19:05 +0300)

Trivial merge