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)
commit1b9a78583fbff3967b91e128dd7f57fcbcdc8db9
treef57f5c66c7b9f2e34664b887752108d746097d1c
parentc2f28e4bb4e6bc8a642d0fdc0b09b012042e9724
parent4155aec42e2aa48af1ebe8f1197f58e2f5830ccf
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.