From: William Pitcock <redacted>
Date: Tue, 19 Jan 2010 07:47:27 +0000 (-0600)
Subject: Automated merge with ssh://hg.atheme.org//hg/charybdis
X-Git-Url: https://jfr.im/git/solanum.git/commitdiff_plain/fdb90316e1ce6aee0347889c4ca1dff36b0a70a8

Automated merge with ssh://hg.atheme.org//hg/charybdis
---

fdb90316e1ce6aee0347889c4ca1dff36b0a70a8