From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 12 Jul 2009 18:27:13 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d159b6be1862ab09f4a363b38515ff1f2f74a506;p=monkeysphere.git

Merge commit 'jrollins/master'
---

d159b6be1862ab09f4a363b38515ff1f2f74a506