From: Jameson Rollins <jrollins@finestructure.net>
Date: Tue, 23 Mar 2010 06:12:33 +0000 (-0400)
Subject: Merge remote branch 'mjgoins/master'
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=dbeab30f940705e3813746ccf7480619d8261d37;hp=2f9fe93b98ed32b662212899db6ba2174c1138d3

Merge remote branch 'mjgoins/master'

Conflicts:
	doc/george/changelog
---