]> jfr.im git - irc/freenode/ircd-seven.git/commitdiff
Merge branch 'master+umodes' of https://github.com/Adam-/charybdis
authorJilles Tjoelker <redacted>
Mon, 19 May 2014 21:37:20 +0000 (23:37 +0200)
committerJilles Tjoelker <redacted>
Mon, 19 May 2014 21:37:20 +0000 (23:37 +0200)

Trivial merge