Mention the git-upstream-brdiff script.
Merge branch 'markj-develop' of github.com:markjdb/freebsd into markj-develop