]> 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: 245c2d9 2d42e48)
Merge branch 'master+gnutls-packet-read'
authorAttila Molnar <attilamolnar@hush.com>
Sun, 1 Mar 2015 14:20:16 +0000 (15:20 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Sun, 1 Mar 2015 14:20:16 +0000 (15:20 +0100)

Trivial merge