From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 15 Nov 2008 23:57:57 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.22-1~13^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d39039bbc33b3f6cff881114b7accd3e7cffdc94;p=monkeysphere.git

Merge commit 'micah/master'

Conflicts:

	src/monkeysphere-server
---

d39039bbc33b3f6cff881114b7accd3e7cffdc94