From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 21 Feb 2009 19:50:18 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~16
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=35559940b9ccab1df260da9da30dff5991a1778e

Merge commit 'jrollins/master'
---

35559940b9ccab1df260da9da30dff5991a1778e