]> jfr.im git - irc/evilnet/znc.git/commitdiff
projects / irc / evilnet / znc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad99d5f aa6e7e7)
Merge branch '1.6.1' into 1.6.x
authorJ-P Nurmi <redacted>
Mon, 3 Aug 2015 23:12:42 +0000 (01:12 +0200)
committerJ-P Nurmi <redacted>
Mon, 3 Aug 2015 23:14:31 +0000 (01:14 +0200)

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