From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 15 Nov 2008 21:17:44 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.21-1~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0059745029d4b05b901663d65110fd4bae150138;hp=a79d359aac1e52cbdb462a07cbfc07bd27276133;p=monkeysphere.git

Merge commit 'jrollins/master'
---