From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 3 Sep 2008 03:40:19 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.13-1~15
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2569f05159e019bc5ceb37aa7c10c66ac5bc8c8b;hp=-c;p=monkeysphere.git

Merge commit 'jrollins/master'
---

2569f05159e019bc5ceb37aa7c10c66ac5bc8c8b