Merge remote-tracking branch 'origin/master' into amakeev/run_environment appcode/144.3627 clion/144.3630
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 2 Feb 2016 14:39:06 +0000 (15:39 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 2 Feb 2016 14:39:06 +0000 (15:39 +0100)
commit3ec7f309d51cf703a1bfbb8d929a366368d34081
treefc7792e862952067a4d0c35c1fa8fc3c17b89def
parentb66c49973f564c8b7e72ea10221bf149aface970
parente00bcb6ea00cd96495974a7c56b197a58eada552
Merge remote-tracking branch 'origin/master' into amakeev/run_environment