Mismerged a bit.
authorMark Michelson <mmichelson@digium.com>
Tue, 5 Jan 2010 20:56:50 +0000 (20:56 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 5 Jan 2010 20:56:50 +0000 (20:56 +0000)
commit2fa64b3ad476ff933ffd972bbdb6dbe8e2af5a3e
tree3e24877b1adf22167a560e540e311fa2d523a3f4
parentbebe42f3a718269e92aacbcc5e9899d675f92b4d
Mismerged a bit.

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