From: Micah Anderson <micah@riseup.net>
Date: Sun, 22 Mar 2009 23:57:35 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~32^2~6^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=abd2c7a17b57d7b802353c851c2150b07824a3a5;hp=abd2c7a17b57d7b802353c851c2150b07824a3a5;p=monkeysphere.git

Merge commit 'jrollins/master'

Conflicts:
	website/download.mdwn
---