From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 2 Sep 2008 22:44:13 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.12-1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2dd8874fe0df18649d6ecbcbd39ced21624fbe1;p=monkeysphere.git

Merge commit 'jrollins/master'
---

c2dd8874fe0df18649d6ecbcbd39ced21624fbe1