Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 8 Oct 2016 18:23:21 +0000 (20:23 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 8 Oct 2016 18:23:21 +0000 (20:23 +0200)
commit438afbaf1c05d869886642b62125ee67e6e4c5ef
tree1daac6f72ab8d9c019351b26cd53dc48205ff39d
parent994175dc1357465980b19c2d22f7af5a8aad090d
parentd5022d257200b5916f5e62bbe0941bdacd0c7797
Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs