Merged from revision 304341
authorRichard Mudgett <rmudgett@digium.com>
Thu, 27 Jan 2011 00:06:27 +0000 (00:06 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 27 Jan 2011 00:06:27 +0000 (00:06 +0000)
commitecdbb3d1d924163e38a91848816353953dd3d5ec
tree438a3a6bf7087d6269980a86954277c22ac4e923
parent1c60cead78a942a334c181d40d41d8d26f31f724
Merged from revision 304341
https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

..........
  r304341 | rmudgett | 2011-01-26 16:38:39 -0600 (Wed, 26 Jan 2011) | 7 lines

  Add connected line chan_dahdi.conf pricpndialplan option.

  * Added from_channel value to prilocaldialplan option.

  JIRA ABE-2731
  JIRA SWP-2842
..........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_dahdi.c
channels/sig_pri.c
channels/sig_pri.h
configs/chan_dahdi.conf.sample