Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 10 Nov 2015 16:49:28 +0000 (17:49 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 10 Nov 2015 16:49:28 +0000 (17:49 +0100)
commitc345adb26409a7d0ae3084759372685a6678abf1
treed3ae371de0ace17ac0c5c88ffbe2823939a1669a
parent6771b5907f45b4cf964ba7e686501dfbe722cab2
parent6a1844b043a44764455dbfcd6317d109b38b8ec1
Merge remote-tracking branch 'origin/master' into mark_folder_as