From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 3 Oct 2010 04:18:24 +0000 (-0400)
Subject: Merge remote branch 'jrollins/master'
X-Git-Tag: monkeysphere_0.32-1~2^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a429c2192f42544c23d4a9fec14c13f9f40e30d8;p=monkeysphere.git

Merge remote branch 'jrollins/master'
---

a429c2192f42544c23d4a9fec14c13f9f40e30d8