]> 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: 693ff4c 2c7c0cd)
Merge branch 'master+gnutlsprio'
authorAttila Molnar <attilamolnar@hush.com>
Thu, 12 Nov 2015 12:45:57 +0000 (13:45 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Thu, 12 Nov 2015 12:45:57 +0000 (13:45 +0100)

Trivial merge