From: Jamie McClelland <jm@mayfirst.org>
Date: Sat, 6 Sep 2008 06:59:12 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.16-1~87
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2c6c9e84ef5417987d90d45d28be6894df5afe35;hp=2c6c9e84ef5417987d90d45d28be6894df5afe35;p=monkeysphere.git

Merge commit 'dkg/master'
---