From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 5 Sep 2008 15:31:23 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.15-1~4
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3cf7b2a42a93a456102eab977d0cd25178663696;p=monkeysphere.git

Merge commit 'jamie/master'
---

3cf7b2a42a93a456102eab977d0cd25178663696