chiark / gitweb /
Merge remote branch 'crybaby'
authorMark Wooding <mdw@distorted.org.uk>
Wed, 31 Mar 2010 09:13:14 +0000 (10:13 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 31 Mar 2010 09:13:14 +0000 (10:13 +0100)
* crybaby:
  dot/emacs: Mark the `edit-server' process as expendable.

1  2 
dot/emacs

diff --cc dot/emacs
Simple merge