]> 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: b067669 bd6ca75)
Merge branch 'master+callerid' into master+flatmap
authorAttila Molnar <attilamolnar@hush.com>
Mon, 15 Dec 2014 16:02:26 +0000 (17:02 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Mon, 15 Dec 2014 16:02:26 +0000 (17:02 +0100)

Trivial merge