Merge branches 'evagl/OC-11226' and 'master' of git.labs.intellij.net:idea/community
authorAleksandr Samofalov <aleksandr.samofalov@jetbrains.com>
Wed, 15 Jun 2016 15:44:54 +0000 (18:44 +0300)
committerAleksandr Samofalov <aleksandr.samofalov@jetbrains.com>
Wed, 15 Jun 2016 15:44:54 +0000 (18:44 +0300)
commit975c822fb57b498e78f1f7f75003961fd9279deb
tree4102adb7801d2de7e5af0feacdd66058861cbc0d
parent47cef86c7c0661d1107b1b52a6ebf36076ca43b1
parente65be7e1eb9ddeffd96225de60ad245c758abe15
Merge branches 'evagl/OC-11226' and 'master' of git.labs.intellij.net:idea/community