From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 15 Nov 2008 20:59:34 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.21-1~1^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=inline;h=4dce7a981d0bb27c2c69f4f756a48f9afd4ea04f;p=monkeysphere.git

Merge commit 'dkg/master'
---

4dce7a981d0bb27c2c69f4f756a48f9afd4ea04f