Merged revisions 292557 via svnmerge from

Merged revisions 292557 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292557 | lmadsen | 2010-10-21 08:12:19 -0500 (Thu, 21 Oct 2010) | 14 lines

  Merged revisions 292556 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r292556 | lmadsen | 2010-10-21 08:11:52 -0500 (Thu, 21 Oct 2010) | 6 lines

    Change res_ldap.sample.conf to match the schema.

    (closes issue #17376)
    Reported by: jcovert
    Patches:
          res_ldap.conf.sample.patch uploaded by jcovert (license 551)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292559 65c4cc65-6c06-0410-ace0-fbb531ad65f3