From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 27 Aug 2008 22:38:48 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.12-1~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ee3758b00280d54bc015ac78a02868430f93818;p=monkeysphere.git

Merge commit 'jrollins/master'
---

4ee3758b00280d54bc015ac78a02868430f93818