From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 3 Sep 2008 20:42:38 +0000 (-0400)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.13-1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8014911df4a7fcc7e85abf468791cfc048a48ef;p=monkeysphere.git

Merge commit 'micah/master'
---

a8014911df4a7fcc7e85abf468791cfc048a48ef