projects / srvx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: a1607b8)
Merge remote branch 'upstream/master'
authorroot <root@mail.pk910.de>
Wed, 9 Nov 2011 15:27:40 +0000 (16:27 +0100)
committerroot <root@mail.pk910.de>
Wed, 9 Nov 2011 15:27:40 +0000 (16:27 +0100)
Conflicts:
src/chanserv.c


No differences found
SRVX IRC Network Services