Merge remote-tracking branch 'origin/master' into mark_folder_as clion/144.1796
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 4 Dec 2015 15:35:18 +0000 (16:35 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 4 Dec 2015 15:35:18 +0000 (16:35 +0100)
commit9c6402448aa5820b8995f03d850ca482cad38d26
tree9c3f70fbe0f42bdf25b80839a04b3d6085a1883d
parent709c18efc26398ec82345a1adf9d1de8bdbbb36c
parent84863b5c4825f6a687fabc051623c77d4d207a3f
Merge remote-tracking branch 'origin/master' into mark_folder_as