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)
commitaaddba721e58ddfcfaf589d41348a8186d5ef317
treeb4cfbda2da5922942dc161968edb2963880709c0
parenteeda89bfa6b5902bd264569ae035bf5fab003c44
parentfdfa65ce72ed90f66fecc3e4233261482cf26d54
Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/community into evagl/included-from