From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 18 Jan 2010 06:38:36 +0000 (-0500)
Subject: Merge remote branch 'jrollins/master'
X-Git-Tag: monkeysphere_0.28~33
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=cb23b390761c20358c5db30203589c823c7b5bbf;p=monkeysphere.git

Merge remote branch 'jrollins/master'
---

cb23b390761c20358c5db30203589c823c7b5bbf