From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 15 Aug 2008 18:28:30 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.8-1~13^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22476961b7915076e6ae7f353b563516f9931a04;p=monkeysphere.git

Merge commit 'jrollins/master'
---

22476961b7915076e6ae7f353b563516f9931a04