Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 30 Oct 2015 14:18:05 +0000 (15:18 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 30 Oct 2015 14:18:05 +0000 (15:18 +0100)
commit456be55883ddfb5ff90930c628f5227439c79e71
tree75128ec187cd51230b5f0944a633f5fb88f84011
parent4ed812b336a010e240278b1d8eb5396ad730a65e
parent7f7f1cb119818b6f4de791eecf509eac44ed7e18
Merge remote-tracking branch 'origin/master' into mark_folder_as