]> jfr.im git - irc/charybdis-ircd/charybdis.git/commitdiff
projects / irc / charybdis-ircd / charybdis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c918eb5 d1316b1)
Merge branch 'master' of git.atheme.org:/gitroot/charybdis
authorWilliam Pitcock <redacted>
Sun, 4 Mar 2012 23:25:17 +0000 (17:25 -0600)
committerWilliam Pitcock <redacted>
Sun, 4 Mar 2012 23:25:17 +0000 (17:25 -0600)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.