From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 14 Sep 2008 21:48:56 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.16-1~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f65b455d187cfc86767de355a540f4ea19560b5;p=monkeysphere.git

Merge commit 'jamie/master'
---

9f65b455d187cfc86767de355a540f4ea19560b5