From: Joshua Colp <jcolp@digium.com>
Date: Tue, 21 Feb 2017 22:34:56 +0000 (-0600)
Subject: Merge changes from topic 'ASTERISK-26580' into 13
X-Git-Tag: 13.15.0-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef105410d8916b4244887755bcf2f281df9f0889;p=thirdparty%2Fasterisk.git

Merge changes from topic 'ASTERISK-26580' into 13

* changes:
  res_config_ldap: Don't try to delete non-existent attributes
  res_config_ldap: Remove extraneous line numbers from log messages
  res_config_ldap: Make memory allocation more consistent
  res_config_ldap: Fix configuration inheritance from _general
---

ef105410d8916b4244887755bcf2f281df9f0889