summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorSean Bright <sean@malleable.com>2011-05-04 02:39:11 +0000
committerSean Bright <sean@malleable.com>2011-05-04 02:39:11 +0000
commitc596329564576edae921931b58e72613aab68844 (patch)
treeea5f31c8295d31fe3ed6b4b9c8c12ac1cfce1873 /channels
parentfbe3c85deef84bcc46494873bc160e1d17b156be (diff)
Merged revisions 316476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r316476 | seanbright | 2011-05-03 22:34:01 -0400 (Tue, 03 May 2011) | 17 lines Merged revisions 316475 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r316475 | seanbright | 2011-05-03 22:23:01 -0400 (Tue, 03 May 2011) | 10 lines Honor the C option to MeetMe when L is passed. This fixes a case that r304773 and friends missed. (closes issue #17317) Reported by: var Patches: meetme-continue-on-l_16218.diff uploaded by var (license 1227) Tested by: seanbright ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
0 files changed, 0 insertions, 0 deletions