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

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

de9ada50ded59ff4d464a5f0e8ebfb88afd344b4