Resolved a rebasing conflict in CHANGES.rst
Resolved a rebasing conflict in CHANGES.rst

aleksandr-bakanov/astropy,bsipocz/astropy,bsipocz/astropy,mhvk/astropy,mhvk/astropy,pllim/astropy,astropy/astropy,saimn/astropy,pllim/astropy,MSeifert04/astropy,kelle/astropy,kelle/astropy,stargaser/astropy,aleksandr-bakanov/astropy,AustereCuriosity/astropy,kelle/astropy,joergdietrich/astropy,joergdietrich/astropy,AustereCuriosity/astropy,saimn/astropy,lpsinger/astropy,AustereCuriosity/astropy,StuartLittlefair/astropy,lpsinger/astropy,dhomeier/astropy,StuartLittlefair/astropy,larrybradley/astropy,stargaser/astropy,dhomeier/astropy,larrybradley/astropy,funbaker/astropy,lpsinger/astropy,tbabej/astropy,AustereCuriosity/astropy,astropy/astropy,MSeifert04/astropy,MSeifert04/astropy,kelle/astropy,DougBurke/astropy,larrybradley/astropy,larrybradley/astropy,saimn/astropy,StuartLittlefair/astropy,funbaker/astropy,joergdietrich/astropy,funbaker/astropy,astropy/astropy,lpsinger/astropy,DougBurke/astropy,DougBurke/astropy,aleksandr-bakanov/astropy,mhvk/astropy,mhvk/astropy,tbabej/astropy,dhomeier/astropy,larrybradley/astropy,astropy/astropy,funbaker/astropy,astropy/astropy,StuartLittlefair/astropy,stargaser/astropy,lpsinger/astropy,dhomeier/astropy,tbabej/astropy,pllim/astropy,saimn/astropy,bsipocz/astropy,mhvk/astropy,pllim/astropy,StuartLittlefair/astropy,AustereCuriosity/astropy,kelle/astropy,tbabej/astropy,saimn/astropy,aleksandr-bakanov/astropy,joergdietrich/astropy,dhomeier/astropy,DougBurke/astropy,stargaser/astropy,tbabej/astropy,bsipocz/astropy,joergdietrich/astropy,MSeifert04/astropy,pllim/astropy