Merge City

Well, I finally finished all those merges I needed to do. It took about 3 days longer than expected! And there are more painful merges to come. 🙁
I’ve still to finish packaging up the release. But I’ve stopped that while I have to branch from a previous release of another project coz, the client doesn’t have time to test the last release! So they want the previous release (which hasn’t gone live yet) PLUS one more piece of work.