From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 10 Mar 2009 15:43:03 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~32^2~19^2
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=4d3d6d2b49d21e5e1ed0b0d3e32d21f99b0e2588

Merge commit 'dkg/master'
---

4d3d6d2b49d21e5e1ed0b0d3e32d21f99b0e2588