From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 15 Aug 2008 17:18:26 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.8-1~15^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8661f2790762c0d205b6e068f712b20406cb4ce4;p=monkeysphere.git

Merge commit 'jrollins/master'
---

8661f2790762c0d205b6e068f712b20406cb4ce4