Merge branch 'master' into amakeev/run_environment
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 13 Jan 2016 19:01:01 +0000 (20:01 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 13 Jan 2016 19:01:01 +0000 (20:01 +0100)
commit6efcd321da558e17444e2ced00b7c21140f220ad
tree4780e6aebdad2c79e1230d1a996ccaa3781ca2d8
parented3d008904d46e419f7fb5c395c2c75a26f55b36
parentfe15459e98cd57439afe43c99274f4d1b674fc40
Merge branch 'master' into amakeev/run_environment