From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 15 Nov 2008 21:21:54 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.21-1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f50d48f2c1f7dc1d3334cea4b62a1ce15f8ba15c;p=monkeysphere.git

Merge commit 'micah/master'
---

631af9518907f9c4945c3969aaa218eed2554f47