From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 18 Nov 2008 06:51:33 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.22-1~13
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0c56afeb82fe03e007a99b5cbc12bef9bcd6e452;p=monkeysphere.git

Merge commit 'micah/master'
---

0c56afeb82fe03e007a99b5cbc12bef9bcd6e452