Rebase?

[Alan DeKok]

Phil Mayers wrote:
> Did someone rebase master? I just failed a ff-merge on my local copy (no
> changes) and some commits appear to have changed IDs e.g.

  Arran's maverick changes worked for mavericks, and broke most other
things.  My attempts to fix that went down a rabbit hole of insanity.

  Rather than try to figure out what was wrong, I nuked the changes and
re-did them.  Lo and behold... they all worked.

  Alan DeKok.