From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 17 Jul 2009 13:42:23 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.26~35^2
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=1080589181dd117ef5ab3549e67d206f8a64e834

Merge commit 'jrollins/master'
---

1080589181dd117ef5ab3549e67d206f8a64e834