* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
el/dot-emacs.el: Better fontification for Ediff.
dot/emacs: Set new variable for Python indent level.
setup: Just symlink all of the backgrounds.
bg/twins.jpg: The Twins: Kate and Grace Hoare, by John Everett Millais.
dot/gnus-local.el.distorted: Changes to support later Gnus versions.