From: Matt Goins <mjgoins@openflows.com>
Date: Sat, 21 Feb 2009 21:54:39 +0000 (-0500)
Subject: Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/monkeysphere
X-Git-Tag: monkeysphere_0.25~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e0502a242b89c73535b00cc1b199dfea38ce4d4;p=monkeysphere.git

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

4e0502a242b89c73535b00cc1b199dfea38ce4d4