Merge "Core: Add support for systemd socket activation."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 26 Jul 2017 14:17:40 +0000 (09:17 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 26 Jul 2017 14:17:40 +0000 (09:17 -0500)
1  2 
main/asterisk.c

diff --cc main/asterisk.c
Simple merge