From: mike castleman <m@mlcastle.net>
Date: Mon, 17 Nov 2008 08:00:13 +0000 (-0500)
Subject: Merge commit 'web/master'
X-Git-Tag: monkeysphere_0.22-1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d4d7735c039f2e8623771c5b7ead05aa85831ec;p=monkeysphere.git

Merge commit 'web/master'
---

2d4d7735c039f2e8623771c5b7ead05aa85831ec