From: Matt Goins <mjgoins@openflows.com>
Date: Wed, 25 Jun 2008 05:59:19 +0000 (-0400)
Subject: Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
X-Git-Tag: monkeysphere_0.4-1~24
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=43097e923b8051ecd0912e367c1cd78149a97dbe;p=monkeysphere.git

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

43097e923b8051ecd0912e367c1cd78149a97dbe