Merged revisions 300166 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Mon, 3 Jan 2011 23:18:20 +0000 (23:18 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 3 Jan 2011 23:18:20 +0000 (23:18 +0000)
commit9be73e35de3ff7455063db96326c351b65dc52fa
treecd9305621c46fdba688f25d8adade7413282aa16
parent19d14fe577a9196a5f6a4a0aeea4b32a994f999d
Merged revisions 300166 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300166 | rmudgett | 2011-01-03 17:14:55 -0600 (Mon, 03 Jan 2011) | 11 lines

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

  ........
    r300165 | rmudgett | 2011-01-03 17:02:13 -0600 (Mon, 03 Jan 2011) | 4 lines

    Use correct variable for atxfercallbackretries config option.

    * Misc formatting changes.
  ........
................

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