Fix change-log entry after rebase
Fix change-log entry after rebase

lpsinger/astropy,saimn/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,dhomeier/astropy,dhomeier/astropy,lpsinger/astropy,astropy/astropy,astropy/astropy,astropy/astropy,saimn/astropy,saimn/astropy,larrybradley/astropy,aleksandr-bakanov/astropy,mhvk/astropy,saimn/astropy,lpsinger/astropy,dhomeier/astropy,StuartLittlefair/astropy,mhvk/astropy,mhvk/astropy,pllim/astropy,aleksandr-bakanov/astropy,pllim/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,saimn/astropy,dhomeier/astropy,dhomeier/astropy,StuartLittlefair/astropy,pllim/astropy,mhvk/astropy,lpsinger/astropy,mhvk/astropy,lpsinger/astropy,astropy/astropy,larrybradley/astropy,astropy/astropy,pllim/astropy,larrybradley/astropy,pllim/astropy,larrybradley/astropy,aleksandr-bakanov/astropy,larrybradley/astropy