From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 25 Oct 2008 23:32:28 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.16-1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c80b8027f8a266c6b9b0d6d8f5970aa1a0503289;p=monkeysphere.git

Merge commit 'jrollins/master'
---

c80b8027f8a266c6b9b0d6d8f5970aa1a0503289