From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 26 Jul 2008 04:19:20 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.5-1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b19edbe67505aefc755670af4aae0b9ce4269544;p=monkeysphere.git

Merge commit 'jrollins/master'
---

b19edbe67505aefc755670af4aae0b9ce4269544