From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 18 Jan 2010 17:05:37 +0000 (-0500)
Subject: Merge remote branch 'dkg/master'
X-Git-Tag: monkeysphere_0.28~26
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=ce693e829f05de90a4054bdd5d17480d9e6564ab;p=monkeysphere.git

Merge remote branch 'dkg/master'
---

ce693e829f05de90a4054bdd5d17480d9e6564ab