Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 30 Oct 2015 13:33:42 +0000 (14:33 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 30 Oct 2015 13:33:42 +0000 (14:33 +0100)
commit4ed812b336a010e240278b1d8eb5396ad730a65e
tree16cb0907ee14e156bccbc0b0c04ea353c7b7ea17
parenta7a3386a251d061e9693e79bb1b6fef8bb62ba50
parent3e558f8222f2cd689ad3f94662562a82c35081de
Merge remote-tracking branch 'origin/master' into mark_folder_as