From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 27 Apr 2011 00:51:32 +0000 (+0100)
Subject: Merge branch 'master' of vampire:etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/a7b61e882477fdf29727de049e1675c685596ce3

Merge branch 'master' of vampire:etc/profile

* 'master' of vampire:etc/profile:
  dot/ditz-config: Configuration for `ditz' bug tracker.
  el/dot-emacs.el: Load ERC configuration in advance.
  hacks/ssh: Add new hack for setting up background SSH master connections.
  bin/svnwrap: Fix unjustifiably stupid error.
  dot/ercrc.el: Common configuration for ERC.
---

a7b61e882477fdf29727de049e1675c685596ce3