]> jfr.im git - solanum.git/commitdiff
projects / solanum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d0bbdc bde6442)
Automated merge with ssh://hg.atheme.org//hg/charybdis
authorWilliam Pitcock <redacted>
Tue, 19 Jan 2010 07:47:27 +0000 (01:47 -0600)
committerWilliam Pitcock <redacted>
Tue, 19 Jan 2010 07:47:27 +0000 (01:47 -0600)

Trivial merge
Fork of solanum ircd, history is rebased regularly