Merge branch 'master' into develar/pwd
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 27 Jul 2016 09:26:29 +0000 (11:26 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 27 Jul 2016 09:26:29 +0000 (11:26 +0200)
commitddf92b1b7e04164d3cc7e0697b969d2ba142018e
tree8700691ad3e9fc3f04e3b7c9ec90e89d56eb0fd0
parent2e886ac80c7361d97f6aecab867629052889ca9d
parent1b8bfdc4e1366867cbed6fb2b1b3f457920224ad
Merge branch 'master' into develar/pwd