From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 15 Aug 2008 16:03:24 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.8-1~15^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2d4d13faab01c52e7d9da5d084d9f8e3082f4ecb;p=monkeysphere.git

Merge commit 'jrollins/master'
---

2d4d13faab01c52e7d9da5d084d9f8e3082f4ecb