From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 28 Feb 2009 18:11:31 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5aa38db993aeef70d669f9b51b859ac3969b099;p=monkeysphere.git

Merge commit 'dkg/master'
---

b5aa38db993aeef70d669f9b51b859ac3969b099