From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 21:48:43 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~7
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=eb88374be90344d1808fe49a5bc69a547a09280d;hp=eb88374be90344d1808fe49a5bc69a547a09280d;p=monkeysphere.git

Merge commit 'dkg/master'
---