Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 29 Sep 2016 11:45:19 +0000 (13:45 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 29 Sep 2016 11:45:19 +0000 (13:45 +0200)
commit89cee401cee4e1ad0ee6ac1973db20657f1c4857
treea9333989151e252dff60b2730d122fd798689d65
parent2c80275043ce21b3f059c13fd051c384c8b0a013
parentaff263f489a4407647e9492602206fad43d6532c
Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs