move DEFT
new guy
Merge branch 'master' of github.com:jfb/emacs-literal-config

Conflicts:
	bbdb