From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 21 Sep 2010 14:55:18 +0000 (-0400)
Subject: Merge remote branch 'jamie/master'
X-Git-Tag: monkeysphere_0.32-1~2^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b000f2f9abe2a1cd2af07038fb86d39aa89b29d;p=monkeysphere.git

Merge remote branch 'jamie/master'
---

9b000f2f9abe2a1cd2af07038fb86d39aa89b29d