From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 11 Jul 2009 23:04:05 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~24^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e288e3ce07ff84830aeaa414191666fad55db6b;p=monkeysphere.git

Merge commit 'jrollins/master'
---

0e288e3ce07ff84830aeaa414191666fad55db6b