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

Merge commit 'mjgoins/master'
---

3cea2ab969f54fc33ed238c5b326fb3868392a15