From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 22 Jun 2008 04:22:42 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.2-1~12
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c911568316173454e5286c7253dc88f3fb5679e5;hp=c911568316173454e5286c7253dc88f3fb5679e5;p=monkeysphere.git

Merge commit 'jrollins/master'
---