astropy/astropy — pull request #3211 by astrofrog (2014-12-16 12:53:52+00:00)
Title: Use union merge for changelog

Thanks to @Cadair for pointing this out to me - this should allow us to avoid merge conflicts in the changelog in future, if GitHub takes it into account (it should?)