From: Jamie McClelland <jm@mayfirst.org>
Date: Wed, 3 Sep 2008 16:27:44 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.13-1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99b3c2c4aa1e145ed14e22612abb3473016ac307;p=monkeysphere.git

Merge commit 'dkg/master'
---

99b3c2c4aa1e145ed14e22612abb3473016ac307