From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 18 Apr 2010 00:35:20 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: monkeysphere_0.30-1~1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ac73abeaae24fb845a3d68c266d869c2c4d9650b;p=monkeysphere.git

Merge branch 'master' into debian
---

ac73abeaae24fb845a3d68c266d869c2c4d9650b