From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 16 Aug 2008 14:45:49 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.8-1~3^2~7
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=df0e87db1b2f8a8c762d1a1f9ce3c7cd22845b46;hp=-c;p=monkeysphere.git

Merge commit 'jrollins/master'
---

df0e87db1b2f8a8c762d1a1f9ce3c7cd22845b46