I'm not okay with redoing the rename the branches trick. Let's use git how it's supposed to be used.
I've rebased the origin/3.0 branch onto master. There are 81 patches in it. All of the differences between origin/3.0 and rewrite-on-master seem to be mistakes in the 3.0 branch. I'm not advocating pushing this to master yet. The series needs review and some clean up.
