Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 7 Feb 2017 10:50:13 +0000 (13:50 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 7 Feb 2017 10:50:13 +0000 (13:50 +0300)
commit7255d2db0689e3063a7c09e45f3834d86056568a
tree24f2573ec470a2f8f4cd0fd9c3783561519af5e4
parent248aabf6e2ca29ee7464f968868d70723ff7fb2c
parentea28ccc01d914eb0cf998d89a528bef6d0bbaa0a
Merge branch 'master' of git.labs.intellij.net:idea/community