On Mon, Mar 09, 2015 at 15:39:14 -0500,
Bruno Wolff III <bruno(a)wolff.to> wrote:
This commit appears to have made changes to a of spins other than the
the design spin.
It looks like you did another merge between branches. This isn't the
first you have done that. This significantly messes things up. If you
have specific changes you need to move between branches, cherry-pick
is probably
the easiset way to do that.
I double checked this and the merge was with branch 22 from several days
ago. I don't think it broke anything, but it does make things a bit
harder to follow.