Merge "chan_sip: option 'notifyringing' change and doc fix"
authorMark Michelson <mmichelson@digium.com>
Thu, 21 Jan 2016 21:22:53 +0000 (15:22 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jan 2016 21:22:53 +0000 (15:22 -0600)
1  2 
channels/chan_sip.c

Simple merge