From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 4 Oct 2010 05:25:46 +0000 (-0400)
Subject: Merge remote branch 'greg/2459'
X-Git-Tag: monkeysphere_0.32-1~2^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3c00de6d06a49ae54b74f39c667cfab39940266;p=monkeysphere.git

Merge remote branch 'greg/2459'
---

d3c00de6d06a49ae54b74f39c667cfab39940266