Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
authorMatt Goins <mjgoins@openflows.com>
Fri, 20 Jun 2008 18:23:41 +0000 (14:23 -0400)
committerMatt Goins <mjgoins@openflows.com>
Fri, 20 Jun 2008 18:23:41 +0000 (14:23 -0400)
commit3a6f611a52d56b919b8c50a6e1700af43ff49578
tree1bbbb9fef2438c47c5801ea822099c97fabdcf6f
parentb75cb97e42dd3327942d8b32cac2d9ee97e9aa4a
parent9efdaab59edb2ff4454082f6a36c9dc0d90b8885
Merge branch 'master' of lair.fifthhorseman.net/~dkg/git/monkeysphere

Conflicts:

gpg2ssh/Makefile