From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 22:47:19 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.17-1~6^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2288f6b51836d24c3fa12f61dcf81b4048714e91;p=monkeysphere.git

Merge commit 'jrollins/master'
---

2288f6b51836d24c3fa12f61dcf81b4048714e91