chiark / gitweb /
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/tripe
authorMark Wooding <mdw@distorted.org.uk>
Sat, 4 May 2013 21:47:33 +0000 (22:47 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 4 May 2013 21:47:33 +0000 (22:47 +0100)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/tripe:
  server/keymgmt.c: Refactor key loading.


Trivial merge