From: Leif Madsen <leif@leifmadsen.com>
Date: Wed, 3 Mar 2010 21:28:31 +0000 (+0000)
Subject: Recorded merge of revisions 250613 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3332
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5d3f2a39799960150b229c6dfcdd7c8f04b5106;p=thirdparty%2Fasterisk.git

Recorded merge of revisions 250613 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r250613 | lmadsen | 2010-03-03 16:28:02 -0500 (Wed, 03 Mar 2010) | 11 lines

  Update existing Local channel documentation.

  A complete re-write of the Local channel documentation has been performed, with
  the existing information from localchannel.txt and localchannel.tex merged in.

  (issue #16637)
  Reported by: kobaz
  Patches:
        localchannel.tex uploaded by lmadsen (license 10)
        localchannel.txt uploaded by lmadsen (license 10)
  Tested by: lmadsen, jsmith, mmichelson
........


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