]> jfr.im git - solanum.git/commitdiff
projects / solanum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bb1f1b 8669b3b)
Automated merge with ssh://hg.atheme.org//hg/charybdis
authorWilliam Pitcock <redacted>
Sat, 30 May 2009 18:16:01 +0000 (13:16 -0500)
committerWilliam Pitcock <redacted>
Sat, 30 May 2009 18:16:01 +0000 (13:16 -0500)

Trivial merge
Fork of solanum ircd, history is rebased regularly