Merged revisions 328014 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Wed, 13 Jul 2011 18:47:16 +0000 (18:47 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 13 Jul 2011 18:47:16 +0000 (18:47 +0000)
commita97340b5ea33bcce593e35a20742d4dc16b0d430
tree8374023fd7eafdcdba7be98cbe3abebbcbfbbaaa
parentd37ac6a8a0e3c8a0dd0ccf74e94652204c9247f1
Merged revisions 328014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r328014 | rmudgett | 2011-07-13 13:46:38 -0500 (Wed, 13 Jul 2011) | 1 line

  Add ATXFER_NULL_TECH note in features.conf.sample.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/features.conf.sample