mdw@git.distorted.org.uk Git

author	Mark Wooding <mdw@distorted.org.uk>
	Thu, 20 May 2010 13:26:24 +0000 (14:26 +0100)
committer	Mark Wooding <mdw@distorted.org.uk>
	Thu, 20 May 2010 13:26:24 +0000 (14:26 +0100)
commit	1f504136a4d488c4bfcd2b0f7185ba5d9a9d0f6f
tree	7965f1f48d1c7588562eb0290a6b13481287df52	tree \| snapshot (tar.gz zip)
parent	f4daab03daffaef7b886101300fd35e76ffc3f7c	commit \| diff
parent	c07e3e33b80090539c0c89be49eaf82707aafcde	commit \| diff

Merge remote branch 'crybaby'

* crybaby:
dot/emacs: Turn off Senator again.
el/dot-emacs.el: Don't use a fancy face for `which-func'.

dot/emacs	diff1 \|	diff2 \|	blob \| history
el/dot-emacs.el	diff1 \|	diff2 \|	blob \| history