I’ve split up all the various branches, merged 2.1.1 into the 2.1
branch, and set up 2.2 - so, we should be ready to go. I’m busy again
tomorrow, but after that we can start having a look at the milestones
that Mark has (thankfully!) gone through and set up:
I’ve also set up svnmerge on the modules tree, to hopefully ease
importing of patches from 2.1 into 2.2.