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

Merge commit 'jrollins/master'
---

bb75d35fb6705d8a75b88af30274703ca84d45f2