From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 28 Feb 2009 18:13:14 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.24~52^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a8ca11c71b55becac131b58caa27e8d69696587;p=monkeysphere.git

Merge commit 'jrollins/master'
---

6a8ca11c71b55becac131b58caa27e8d69696587