From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 17 Jun 2016 10:23:00 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/652ff1add948209b4d55f461b04c5d54d1d8ad7b

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* '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.
---

652ff1add948209b4d55f461b04c5d54d1d8ad7b