Merge branch 'master' of github.com:purcell/emacs.d
Merge branch 'master' of github.com:purcell/emacs.d
c
Merge branch 'master' of github.com:purcell/emacs.d
c
Merge branch 'master' of github.com:purcell/emacs.d
Merge branch 'master' of github.com:purcell/emacs.d

Conflicts:
	lisp/init-lisp.el
Merge branch 'master' of github.com:purcell/emacs.d
c