From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 4 May 2013 21:47:33 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/tripe
X-Git-Tag: 1.0.0pre13~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/1b9a78583fbff3967b91e128dd7f57fcbcdc8db9

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/tripe

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/tripe:
  server/keymgmt.c: Refactor key loading.
---

1b9a78583fbff3967b91e128dd7f57fcbcdc8db9