Merge branch 'master' of ustrat:~markw/git/staging/profile
authorMark Wooding <mdw@distorted.org.uk>
Wed, 27 Apr 2016 08:45:03 +0000 (09:45 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 27 Apr 2016 08:45:03 +0000 (09:45 +0100)
commita9e7b214b508f76c26b937f8342c7896854f38f9
tree7511c60a1f1b9d540dedb959b0c3e3aa5b3c50dc
parent563555cf7d52da985de9ea6ca37f0facccec8f25
parentb04f090f76e65f6e5f1615170b4a6ca29821a298
Merge branch 'master' of ustrat:~markw/git/staging/profile

* 'master' of ustrat:~markw/git/staging/profile:
  dot/emacs: Turn on `view-read-only' by default.
  el/dot-emacs.el: Hook more functions for angry-fruit-salad.
  dot/emacs: Kick BBDB to always include a name when completing addresses.
  dot/gitconfig.in: Tell Git where to find the cookie jar.