From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 23 Jul 2009 04:48:45 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.26~29
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c8d0dccee22d1fe4e65edebbf624915c3fc8a8af;p=monkeysphere.git

Merge commit 'dkg/master'
---

c8d0dccee22d1fe4e65edebbf624915c3fc8a8af