updated changelog

--HG--
branch : beta
fixed bad merge on git fetch fix

--HG--
branch : beta