From: Matt Goins <mjgoins@openflows.com>
Date: Fri, 20 Jun 2008 18:23:41 +0000 (-0400)
Subject: Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
X-Git-Tag: monkeysphere_0.4-1~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a6f611a52d56b919b8c50a6e1700af43ff49578;p=monkeysphere.git

Merge branch 'master' of lair.fifthhorseman.net/~dkg/git/monkeysphere

Conflicts:

	gpg2ssh/Makefile
---

3a6f611a52d56b919b8c50a6e1700af43ff49578