Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 16:38:34 +0000 (18:38 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 16:38:34 +0000 (18:38 +0200)
commit637c7b4820a05be31c082f58aef38b2e2dd869c1
tree9809c1c26c115c9ad7a78169fadbdd252a6f777f
parentf9bd93bcea385cf13ef7ff8258ee0bc019f65e7e
parent6ceea5ab2b319d4aa6dc239dd42163a9b24b6d46
Merge remote-tracking branch 'origin/master' into develar/is