Merge remote-tracking branch 'origin/master' into amakeev/symlinks
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 31 Aug 2016 15:25:44 +0000 (17:25 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 31 Aug 2016 15:25:44 +0000 (17:25 +0200)
commit85b2c0db9a2e5f11eb0d7e542886641e3e8efab1
treed14807a64b9a557655a4f099ba52757c1e6a337f
parent5c6939ec1ac1b178a9bb13915740d45a7d0194b7
parentb7f5ceba06cbf783a7223440fbc009709bae7435
Merge remote-tracking branch 'origin/master' into amakeev/symlinks