From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 7 Feb 2010 18:18:44 +0000 (-0500)
Subject: Merge remote branch 'micah/master'
X-Git-Tag: monkeysphere_0.29~43
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1a64ed28ce14cdb98ff5ff15430ac03da0c3dc78;hp=1a64ed28ce14cdb98ff5ff15430ac03da0c3dc78;p=monkeysphere.git

Merge remote branch 'micah/master'
---