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

Merge commit 'jrollins/master'
---

60c5bfae244d5bf7da9efa195d487ee4b884fcf1