Merge remote-tracking branch 'origin/master' into mark_folder_as appcode/144.1326 clion/144.1328
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 20 Nov 2015 19:56:31 +0000 (20:56 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 20 Nov 2015 19:56:31 +0000 (20:56 +0100)
commit1580bf49d4d0bae7df24dfe3e2058100506c1388
tree433c94622e40115c74456ce7b3cc85b56fa80835
parent092a96d93bb071f96ff40cb109c39169122d9cfe
parentadbbf7d28eb8dc254020b8f6b58375ef3c47722e
Merge remote-tracking branch 'origin/master' into mark_folder_as