Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 25 Mar 2016 13:49:41 +0000 (13:49 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 25 Mar 2016 13:49:41 +0000 (13:49 +0000)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  dot/emacs: More sophisticated setup of `load-path'.

1  2 
dot/emacs

diff --cc dot/emacs
Simple merge