From: Micah Anderson <micah@riseup.net>
Date: Sat, 31 Jan 2009 21:39:40 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~160^2~1^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a693e9be61d02196e2583e9096cb049982a26668;p=monkeysphere.git

Merge commit 'jrollins/master'

Conflicts:
	website/sidebar.mdwn
---

a693e9be61d02196e2583e9096cb049982a26668