Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Sep 2016 16:13:24 +0000 (18:13 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Sep 2016 16:13:24 +0000 (18:13 +0200)
commita28d780f9a13140f9ea69bcf2c8e0b24f039ecd2
treec5a97e91164349889bda67ce02e91cab8010b89e
parent93ee06d492992e3ad6dd9749ff6a889072ffc3f3
parent867a87c316972a5351d7a4db656799979668f410
Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs