Merge "core: Disable astobj2 locking for some common objects."
authorGeorge Joseph <gjoseph@digium.com>
Wed, 3 Oct 2018 15:16:20 +0000 (10:16 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 3 Oct 2018 15:16:20 +0000 (10:16 -0500)
1  2 
main/loader.c

diff --cc main/loader.c
Simple merge