Merge CHANGES.rdoc and History.rdoc