From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Wed, 18 Mar 2009 16:30:24 +0000 (-0400)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.25~32^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9624db952c7c151b1fe00f129fe17a9dcbbb1445;p=monkeysphere.git

Merge commit 'micah/master'

Conflicts:
	website/download.mdwn
---

9624db952c7c151b1fe00f129fe17a9dcbbb1445