From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 13 Nov 2010 23:40:31 +0000 (-0500)
Subject: Merge branch 'master' into debian
X-Git-Tag: monkeysphere_0.35-1~1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ac0c368a89f3e323c0788927561d68cd74f9c41b;p=monkeysphere.git

Merge branch 'master' into debian
---

ac0c368a89f3e323c0788927561d68cd74f9c41b