Merged revisions 283882 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 27 Aug 2010 20:32:21 +0000 (20:32 +0000)
committerJason Parker <jparker@digium.com>
Fri, 27 Aug 2010 20:32:21 +0000 (20:32 +0000)
commit7dd1392fba3f795e46aaae5dca7d8568314186d1
tree850cb33b75fc074b76a2d7cf8a52d5fa3ebaa65e
parent96af228d765e1fc6cf65ee58540c68286e965caa
Merged revisions 283882 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283882 | qwell | 2010-08-27 15:31:55 -0500 (Fri, 27 Aug 2010) | 22 lines

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

  ................
    r283881 | qwell | 2010-08-27 15:30:27 -0500 (Fri, 27 Aug 2010) | 15 lines

    Merged revisions 283880 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r283880 | qwell | 2010-08-27 15:29:11 -0500 (Fri, 27 Aug 2010) | 8 lines

      Fix issue with decoding ^-escaped characters in realtime.

      (closes issue #17790)
      Reported by: denzs
      Patches:
            17790-chunky.diff uploaded by qwell (license 4)
      Tested by: qwell, denzs
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
addons/res_config_mysql.c
main/config.c
res/res_config_odbc.c