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

Merge commit 'jrollins/master'
---