From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 3 Mar 2009 21:25:56 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.24~3^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=81ae2c7e4367f14c46ef8c3a4d7c551d850fc666;hp=-c;p=monkeysphere.git

Merge commit 'jrollins/master'
---

81ae2c7e4367f14c46ef8c3a4d7c551d850fc666