]> 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: 1a6974f be692fc)
Merge branch 'master+tlsversion'
authorAttila Molnar <attilamolnar@hush.com>
Thu, 5 Feb 2015 23:25:42 +0000 (00:25 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Thu, 5 Feb 2015 23:25:42 +0000 (00:25 +0100)

Trivial merge