Remove the dev-4.2 branch.

I have all the break-the-contactlist changes saved and will reapply them. I need to recreate this branch though in order for svnmerge to work properly (apparently).