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)
commitd23ae7cbd160f19d33f75a57ba523d72b136fcdd
treeadf507a02d8dbabb94451b4762c96cd04414caa1
parent68816d7a4e9234756f075f1fe5e9ab30cd753051
parent903ac5d3d68e4c171d2a5a601b8daae10b70489b
Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/community