Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 24 Oct 2015 14:00:24 +0000 (16:00 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 24 Oct 2015 14:00:24 +0000 (16:00 +0200)

Trivial merge