From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 31 Jan 2009 23:30:59 +0000 (-0500)
Subject: merging from jrollins
X-Git-Tag: monkeysphere_0.23~159^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c700e9b0dcede303ed1f160ba51f564fd314d2e3;p=monkeysphere.git

merging from jrollins
---

c700e9b0dcede303ed1f160ba51f564fd314d2e3