From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 1 Feb 2009 01:12:56 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~156^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e4c566d5a1dd25d87d07dac1459a395321b9a5ef;hp=e4c566d5a1dd25d87d07dac1459a395321b9a5ef;p=monkeysphere.git

Merge commit 'dkg/master'
---