mdw@git.distorted.org.uk Git

author	Mark Wooding <mdw@distorted.org.uk>
	Wed, 31 Mar 2010 09:13:14 +0000 (10:13 +0100)
committer	Mark Wooding <mdw@distorted.org.uk>
	Wed, 31 Mar 2010 09:13:14 +0000 (10:13 +0100)
commit	bf9701975604ddb0125d53d4119787341493224b
tree	d5ee954ebf87506fe5845383069217e7ccea1a70	tree \| snapshot (tar.gz zip)
parent	9850239276b1911fe285ac625ce8d8d5d9630190	commit \| diff
parent	955a327c5712eebdf99b9cf64733e90fed540088	commit \| diff

Merge remote branch 'crybaby'

* crybaby:
dot/emacs: Mark the `edit-server' process as expendable.