...
..
Merge branch 'master' of medeltiden.org:private/thomasf/home/emacs

Conflicts:
	emacs.d/lisp/bootstrap.el