]> 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: 7cb7902 ce3ce6c)
Merge branch 'master+timeout'
authorAttila Molnar <attilamolnar@hush.com>
Mon, 8 Dec 2014 21:10:02 +0000 (22:10 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Mon, 8 Dec 2014 21:10:02 +0000 (22:10 +0100)

Trivial merge