From: Micah Anderson <micah@riseup.net>
Date: Tue, 19 Aug 2008 01:06:24 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.11-1~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ac379bdd75617cfab19c3b175a2e10257444de3;p=monkeysphere.git

Merge commit 'jrollins/master'
---

6ac379bdd75617cfab19c3b175a2e10257444de3