From: Matt Goins <mjgoins@openflows.com>
Date: Sun, 22 Jun 2008 23:41:33 +0000 (-0400)
Subject: Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
X-Git-Tag: monkeysphere_0.4-1~26
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e20132d271b8e4bde15cbdb9e56fae53d0ca9fa9;hp=--cc;p=monkeysphere.git

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

e20132d271b8e4bde15cbdb9e56fae53d0ca9fa9