Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 17 Jun 2016 10:23:00 +0000 (11:23 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 17 Jun 2016 10:23:00 +0000 (11:23 +0100)
commit652ff1add948209b4d55f461b04c5d54d1d8ad7b
tree090e31226b84f6c47d6f1bdf931c4753f5d990a8
parentfe6373b29179fbff33a4708b390bcf8ed7d632cd
parenta62d05415841b7ba66ba9a660f68b452c4f1d1b6
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.
dot/emacs