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

Merge remote branch 'dkg/master'
---

a377e69b60eff2fa9e72bb931acb57833560d594