From: JD Horelick <redacted>
Date: Sat, 11 Sep 2010 17:31:13 +0000 (-0400)
Subject: Branch merge
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/2d10c559903b1eed9947f734a7e08b4b2551fd6f

Branch merge
---

2d10c559903b1eed9947f734a7e08b4b2551fd6f