From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 3 Sep 2008 22:29:18 +0000 (-0400)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.14-1~10^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac8f7d1c1addf1cea1c6ffb071de1fcfdc60931b;p=monkeysphere.git

Merge commit 'micah/master'
---

ac8f7d1c1addf1cea1c6ffb071de1fcfdc60931b