From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 19 Jan 2010 08:12:59 +0000 (-0500)
Subject: Merge remote branch 'jrollins/master'
X-Git-Tag: monkeysphere_0.28~4
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=351bf22e962c7ba6da5ee3d8cec9d77264673c88;p=monkeysphere.git

Merge remote branch 'jrollins/master'
---

351bf22e962c7ba6da5ee3d8cec9d77264673c88