fix
Merge branch 'master' of medeltiden.org:private/thomasf/home/emacs
Updated ELPA packages