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

Conflicts:
	emacs.d/site-lisp/shared/helm/misc/helm-buffers.el
...
Merge branch 'master' of medeltiden.org:private/thomasf/home/emacs
up lib
...