Merge the svnserve-logging branch, in its entirety, to trunk, using the