From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 27 Apr 2016 08:45:03 +0000 (+0100)
Subject: Merge branch 'master' of ustrat:~markw/git/staging/profile
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/a9e7b214b508f76c26b937f8342c7896854f38f9

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.
---

a9e7b214b508f76c26b937f8342c7896854f38f9