From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 11 Jun 2008 20:19:26 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~53
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3013b9d9eb534dcc687f5cd426178c369c4dfd4b;hp=-c;p=monkeysphere.git

Merge commit 'jrollins/master'
---

3013b9d9eb534dcc687f5cd426178c369c4dfd4b