From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Feb 2009 06:57:21 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~149
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d27b1e18de6b23968ec59d7b39a798869f415065;p=monkeysphere.git

Merge commit 'jrollins/master'
---

d27b1e18de6b23968ec59d7b39a798869f415065