From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 23 Mar 2010 17:58:48 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: monkeysphere_0.30-1~12
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc80465032c550ee97cefe0edc7ce5d9bb2dd5fe;p=monkeysphere.git

Merge branch 'master' into debian
---

bc80465032c550ee97cefe0edc7ce5d9bb2dd5fe