]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
projects / user / henk / code / inspircd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2df0de3 0aa6c41)
Merge branch 'master+ircstring'
authorAttila Molnar <attilamolnar@hush.com>
Tue, 23 Aug 2016 17:37:03 +0000 (19:37 +0200)
committerAttila Molnar <attilamolnar@hush.com>
Tue, 23 Aug 2016 17:37:03 +0000 (19:37 +0200)

Trivial merge