Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 23 Jun 2016 13:28:57 +0000 (15:28 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 23 Jun 2016 13:28:57 +0000 (15:28 +0200)
commitf405390de047448f8c702f10825e11444a079edc
treefc6b63476e4be844a36f98ea876ea9a62749d8a3
parentc2a79babaa5180be40ec9e8d1bddbf4527a305b5
parent687ee936bb7e5cedc8eb3b54bf59c75a3753313b
Merge remote-tracking branch 'origin/master' into develar/is