Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile

* 'master' of https://git.distorted.org.uk/~mdw/profile:
  dot/gnus.el, dot/gnus-local.el.distorted: Fancy mail sending.
  dot/emacs: I have another chiark email address now.
  dot/gnus-local.el.distorted (gnus-posting-styles): Set address better.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

diff --cc dot/emacs
Simple merge