From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Date: Tue, 24 Jun 2008 05:00:31 +0000 (-0400) Subject: Merge commit 'jrollins/master' X-Git-Tag: monkeysphere_0.3-1 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8277e204f3e19143afb658bd98bd15e97c895a6f;p=monkeysphere.git Merge commit 'jrollins/master' --- a8f860aa2df368ee0a24fe106a5834f6b99b35e3