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

Merge commit 'jamie/master'
---

17aa81f75837311135ac4b29bb4c6b090ecbe4b9