From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 2 Mar 2009 19:27:00 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~15
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=5d4812173522007b7b6786a2c6f6f551394d062b;p=monkeysphere.git

Merge commit 'dkg/master'
---

5d4812173522007b7b6786a2c6f6f551394d062b