From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 25 Oct 2008 21:39:01 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.16-1~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6037a421c142502108ce9525c62cd0db4714ecdb;p=monkeysphere.git

Merge commit 'jrollins/master'
---

6037a421c142502108ce9525c62cd0db4714ecdb