From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 16 Sep 2008 19:32:31 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.16-1~32^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2fed8a803d0eaac47804d8153a44b25002a2c7f5;p=monkeysphere.git

Merge commit 'jamie/master'
---

2fed8a803d0eaac47804d8153a44b25002a2c7f5