Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Oct 2015 13:15:22 +0000 (15:15 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Oct 2015 13:15:22 +0000 (15:15 +0200)
commiteeb9a899ec5c02268529fd72c3b7f2cc238fd6e9
tree26c32622d21b9f4479ea6d1f1728f4bc978a84c8
parent20f5ac06e83be767152ff0c224b5e99777a7ee73
parent3dc30ee461649aeb0cb02d6be3501c9557f62653
Merge remote-tracking branch 'origin/master' into mark_folder_as