Merge branch 'master' into amakeev/run_environment
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 21 Jan 2016 14:12:23 +0000 (15:12 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 21 Jan 2016 14:12:23 +0000 (15:12 +0100)
commitb66c49973f564c8b7e72ea10221bf149aface970
tree56910cb7d999ae64a0e0d7fe04a481934e6969d4
parent3ecb75071da7203a84d83db990dfb93428f595fb
parent83eeacb0e8e0fa3b5c8609c4c414fdc7b3c03981
Merge branch 'master' into amakeev/run_environment