From: Jameson Rollins <jrollins@finestructure.net>
Date: Sun, 4 Jul 2010 04:16:26 +0000 (-0400)
Subject: Merge remote branch 'dkg/master'
X-Git-Tag: monkeysphere_0.31~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1aa3096af58da671b674409010bbd7f3a73332ac;p=monkeysphere.git

Merge remote branch 'dkg/master'
---

1aa3096af58da671b674409010bbd7f3a73332ac