Merged revisions 279601 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 26 Jul 2010 21:08:24 +0000 (21:08 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 26 Jul 2010 21:08:24 +0000 (21:08 +0000)
commit12a06394298a767415648d61ee77be5a17e9895b
treec826a91b6ddc9331f2a6eb7fa1c601c938c1b8b7
parent5a4e87b916cfc1bae450a8973663e124d8acf615
Merged revisions 279601 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r279601 | tilghman | 2010-07-26 16:07:45 -0500 (Mon, 26 Jul 2010) | 19 lines

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

  ........
    r279597 | ghenry | 2010-07-26 15:25:54 -0500 (Mon, 26 Jul 2010) | 13 lines

    Apply all patches in:

    https://issues.asterisk.org/view.php?id=13573

    (closes issue #13573)
    Reported by: navkumar
    Patches:
          res_config_ldap-category.diff uploaded by navkumar (license 580)
          res_config_ldap.patch uploaded by bencer (license 961)
          res_config_ldap uploaded by bencer (license 961)
    Tested by: suretec
  ........
................

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