Merge branch 'master' of git.distorted.org.uk:~mdw/public-git/profile
authorMark Wooding <mdw@distorted.org.uk>
Wed, 14 Nov 2012 21:49:02 +0000 (21:49 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 14 Nov 2012 21:49:02 +0000 (21:49 +0000)
* 'master' of git.distorted.org.uk:~mdw/public-git/profile:
  dot/screenrc: Turn off XON/XOFF flow control.
  dot/ercrc.el: New IRC server at Good HSTG.
  dot/ercrc.el: Rearrange bot greeting.
  el/dot-emacs.el: Nicer colours for Emacs w3m mode.


Trivial merge