]> git.netwichtig.de Git - user/henk/code/inspircd.git/commit
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)
commitb7994533da0e77fae440c60f2bc8d7996434a88c
tree1c8d73a71bec643f70d374b9257bb9ed1f9c82d8
parentb0676698152d88c76020b0fa51942d7297f152f3
parentbd6ca75281a84d42b8643a805ebdff82b020419e
Merge branch 'master+callerid' into master+flatmap