From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 8 Mar 2008 23:42:23 +0000 (-0500)
Subject: Merge branch 'master' of http://lair.fifthhorseman.net/~jrollins/git/monkeysphere
X-Git-Tag: monkeysphere_0.1-1~93^2~2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=67e617d76fce59ccbc125fa530057b97161d416a;p=monkeysphere.git

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

67e617d76fce59ccbc125fa530057b97161d416a