Merged revisions 314206 via svnmerge from

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

................
  r314206 | lmadsen | 2011-04-19 09:28:15 -0500 (Tue, 19 Apr 2011) | 14 lines

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

  ........
    r314205 | lmadsen | 2011-04-19 09:27:50 -0500 (Tue, 19 Apr 2011) | 6 lines

    Remove duplicate documentation from func_channel.c

    (closes issue #18970)
    Reported by: IgorG
    Patches:
          func_channel.c.doc.diff uploaded by IgorG (license 20)
  ........
................

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