From: Micah Anderson Date: Tue, 19 Aug 2008 01:25:16 +0000 (-0400) Subject: Merge branch 'master' of webmaster@george.riseup.net:monkeysphere X-Git-Tag: monkeysphere_0.11-1~12 X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=d78a6e30ed3bc408e6a43077b4024597dfb810bd Merge branch 'master' of webmaster@george.riseup.net:monkeysphere --- d78a6e30ed3bc408e6a43077b4024597dfb810bd