K 10 svn:author V 3 des K 8 svn:date V 27 2014-03-24T19:15:13.778699Z K 7 svn:log V 389 Add a pre-merge script which reverts mechanical changes such as added $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks. END