From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 30 Apr 2009 22:45:59 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~28^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=4ea066ebeb9b01afe213db3455ad1a1ff69c39ea;hp=4ea066ebeb9b01afe213db3455ad1a1ff69c39ea;p=monkeysphere.git

Merge commit 'dkg/master'
---