From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 20 Feb 2009 03:42:43 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e13bbc823bc8fe7a28303e45055643e15d0849cd;p=monkeysphere.git

Merge commit 'jrollins/master'
---

e13bbc823bc8fe7a28303e45055643e15d0849cd