From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Feb 2009 05:00:54 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~150
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=bd249afe1f74e2dfc451f73a261d0dfb4a8b58ca;p=monkeysphere.git

Merge commit 'jrollins/master'
---

bd249afe1f74e2dfc451f73a261d0dfb4a8b58ca