From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 2 Sep 2008 23:40:35 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.12-1~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8deb4a20d99b928661a608cb946b40ae5ab938c7;p=monkeysphere.git

Merge commit 'jrollins/master'
---

8deb4a20d99b928661a608cb946b40ae5ab938c7