From: Matthew James Goins <mjgoins@openflows.com>
Date: Mon, 11 Jan 2010 00:03:50 +0000 (-0500)
Subject: Merge branch 'master' of git://labs.riseup.net/~micah/monkeysphere
X-Git-Tag: monkeysphere_0.27~7^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=749f1d84177c993d6382c1f80737e21d9fb1ee7b;p=monkeysphere.git

Merge branch 'master' of git://labs.riseup.net/~micah/monkeysphere
---

749f1d84177c993d6382c1f80737e21d9fb1ee7b