Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 24 Jun 2016 13:36:12 +0000 (15:36 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 24 Jun 2016 13:36:12 +0000 (15:36 +0200)
commit749c8105399c9d898a2ff950dd4ccb182673879d
treea3c12e3dc5a4cdd04c872cca052265944fa26151
parent345078c75bde1b800a176bd06190e6ed79ee293e
parenta63c3e539c29e9673a9c89acfb11792cc5bcb818
Merge remote-tracking branch 'origin/master' into develar/is