From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 21 Aug 2008 05:46:15 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.11-1~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3c65d3d8ce819bc94cce81724f0374765e405906;p=monkeysphere.git

Merge commit 'jrollins/master'
---

3c65d3d8ce819bc94cce81724f0374765e405906