From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 20 Jun 2008 15:23:56 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.2-1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f80b0eea7ef0e6d626d87b75261c0150cd11d01;p=monkeysphere.git

Merge commit 'jrollins/master'
---

7f80b0eea7ef0e6d626d87b75261c0150cd11d01