From: B.Greenham <redacted>
Date: Thu, 29 Jul 2010 00:01:55 +0000 (-0400)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/7af1b8d223ae97cfafc60499655c636d55fbca8b?ds=sidebyside

Merge.
---

7af1b8d223ae97cfafc60499655c636d55fbca8b