Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 4 May 2016 16:01:35 +0000 (18:01 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 4 May 2016 16:01:35 +0000 (18:01 +0200)
commit62b0b38993a5df74ccc8d1c62b51d924393e2f9a
tree29b0a7cf4061326cf02d6e3b304db6cb2aad8763
parent7e3cc007bddc613a2dd135370972de4bfc5bd43f
parent32a02359e934680b6481a36bd9813db5973bb756
Merge branch 'master' of git.labs.intellij.net:idea/community