From: Jameson Rollins <jrollins@finestructure.net>
Date: Tue, 23 Mar 2010 06:12:33 +0000 (-0400)
Subject: Merge remote branch 'mjgoins/master'
X-Git-Tag: monkeysphere_0.30~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbeab30f940705e3813746ccf7480619d8261d37;p=monkeysphere.git

Merge remote branch 'mjgoins/master'

Conflicts:
	doc/george/changelog
---

dbeab30f940705e3813746ccf7480619d8261d37