From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 11 Apr 2008 17:20:55 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~79
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a4c93ce43a942be7f92248cb1ef3a1d3313bce5e;p=monkeysphere.git

Merge commit 'jrollins/master'
---

a4c93ce43a942be7f92248cb1ef3a1d3313bce5e