Merge "res_config_ldap: Fix configuration inheritance from _general"
authorzuul <zuul@gerrit.asterisk.org>
Wed, 22 Feb 2017 00:24:05 +0000 (18:24 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 22 Feb 2017 00:24:05 +0000 (18:24 -0600)

Trivial merge