Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 22 Jul 2016 10:18:05 +0000 (12:18 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 22 Jul 2016 10:18:05 +0000 (12:18 +0200)
commit070f4476ce5e43e3b86bff062372f1fffe4e7631
tree423f9caa71e4a0cb46b308fb7f5ed3671380a41a
parent86d19099310484df1d72e02e3cabc49a6c7da53f
parenta2eda03dc56d5e915d54bc69c52f3e4df5cb9f05
Merge remote-tracking branch 'origin/master' into develar/is