More Merge Mania

I finally finished the second lot of code stream merges I mentioned the other week. This lot took me more than two days again. I had to pull one feature out as the ‘performance’ enhancements (nasty page caching hack) meant that the whole thing needs to be done again!
Only three more to do, including one that is pencilled in to take 5 days!