From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 15 Jul 2010 23:21:48 +0000 (-0400)
Subject: Merge branch 'master' into HEAD
X-Git-Tag: monkeysphere_0.31-1~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=60e38bcd0c3ddb23465b69e6529d03fc069ac1cb;p=monkeysphere.git

Merge branch 'master' into HEAD
---

60e38bcd0c3ddb23465b69e6529d03fc069ac1cb