Commit Graph

56 Commits

Author SHA1 Message Date
Richard Mudgett a97340b5ea Merged revisions 328014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r328014 | rmudgett | 2011-07-13 13:46:38 -0500 (Wed, 13 Jul 2011) | 1 line
  
  Add ATXFER_NULL_TECH note in features.conf.sample.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-13 18:47:16 +00:00
Jonathan Rose 6eb9d7e1b5 Merged revisions 318148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318148 | jrose | 2011-05-09 09:18:14 -0500 (Mon, 09 May 2011) | 4 lines
  
  Documenting an observed behavior of features in features.conf.  Since parkinglots use an
  integer for the parkinglot extensions, leading zeros specified in the configuration file
  are ignored.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@318162 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-09 14:21:33 +00:00
Jeff Peeler 41b95ee887 Merged revisions 286931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r286931 | jpeeler | 2010-09-15 14:22:15 -0500 (Wed, 15 Sep 2010) | 16 lines
  
  Add parking extension for non-default parking lots.
  
  This is a new feature that allows for parking to custom parking lots to be
  accessed directly, rather than with channel variables or by changing the
  default parking lot. The extension is set with the parkext option just as the
  default parking lot is done. Also, the manager action has been updated to
  optionally allow a specified parking lot.
  
  (closes issue #14882)
  Reported by: vmikhnevych
  Patches: 
        patch_14882.txt uploaded by mnick (license 874)
        modified by me
  
  Review: https://reviewboard.asterisk.org/r/884/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-15 19:23:56 +00:00
Russell Bryant a9e49f4e45 Update documentation for 'comebacktoorigin' in featuers.conf.
The documentation for this option did not match the code.  Fix that along with
some minor cleanups to the code along the way.  Document a slight change in
behavior (to something that was previously undocumented) in UPGRADE.txt.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-21 13:02:46 +00:00
Russell Bryant b4ba8548e1 Fix some issues related to dynamic feature groups in features.conf.
The bridge handling code did not properly consider feature groups when setting
parameters that would affect whether or not a native bridge would be attempted.
If DYNAMIC_FEATURES only include a feature group, a native bridge would occur
that may prevent features from working.

Fix a bug in verbose output that would show the key mapping as empty if it was
using the default mapping and not a custom mapping in the feature group.

Add feature groups to the output of "features show".

Adjust the feature execution logic to match that of the logic when executing
a feature that was not configured through a feature group.

Update features.conf.sample to show that an '=' is still required if using
the default key mapping from [applicationmap].

Finally, clean up a little bit of formatting to better coform to coding
guidelines while in the area.

(closes issue #17589)
Reported by: lmadsen
Patches:
      issue_17589.rev4.txt uploaded by russell (license 2)
Tested by: russell, lmadsen


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-09 21:57:21 +00:00
Russell Bryant 2d63b5735c Move parking lot sample config out from the middle of dynamic features sample config.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-09 18:11:13 +00:00
Tilghman Lesher 8b7a90a026 Yet another issue where the conversion of the application delimiter to comma caused an issue.
Application arguments within the feature map could possibly contain a comma,
which conflicts with the syntax of the features.conf configuration file.  This
patch allows the argument to be wrapped in parentheses or quoted, to allow the
application arguments to be interpreted as a single configuration parameter.

(closes issue #16646)
 Reported by: pinga-fogo
 Patches: 
       20100414__issue16646.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman
 
Review: https://reviewboard.asterisk.org/r/547/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@257262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-14 22:57:35 +00:00
David Vossel 57c819fd5e addition of dynamic parkinglots feature
This feature allows for parkinglots to be created dynamically within
the dialplan.  Thanks to all who were involved with getting this patch
written and tested!

(closes issue #15135)
Reported by: IgorG
Patches:
      features.dynamic_park.v3.diff uploaded by IgorG (license 20)
      2009090400_dynamicpark.diff.txt uploaded by mvanbaak (license 7)
      dynamic_parkinglot.diff uploaded by dvossel (license 671)
Tested by: eliel, IgorG, acunningham, mvanbaak, zktech

Review: https://reviewboard.asterisk.org/r/352/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@247248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-02-17 18:29:48 +00:00
Sean Bright f22962a0c1 Remove a bunch of trailing whitespace in preparation for reformatting/cleanup.
Let's try that again, this time removing trailing whitespace and not leading
whitespace.  I can't believe no one noticed.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 14:39:21 +00:00
Sean Bright a7d813cae7 Remove a bunch of trailing whitespace in preparation for reformatting/cleanup.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 14:32:03 +00:00
Mark Michelson dababe2148 Merged revisions 186174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r186174 | mmichelson | 2009-04-02 16:55:34 -0500 (Thu, 02 Apr 2009) | 5 lines
  
  Fix instructions in one-step parking comment to make more sense.
  
  Changed a capital K to a lowercase k.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@186175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-02 21:56:21 +00:00
Steve Murphy ec6101595e Merged revisions 178956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

In this case, it's just a matter of reducing the default timeouts from 2000
to 1000 msec, as the max def feature digit timeout is no longer halved.

........
  r178956 | murf | 2009-02-26 14:27:32 -0700 (Thu, 26 Feb 2009) | 18 lines
  
  This change moves the default feature digit timeout to 1000 ms from the previous default of 500.
  
  As per bug 14515, a dev discussion arrived at a "mediated concensus" 
  of a default feature digit timeout of 1.0 sec. Some voted for 1300;
  ctooley thought 1500 for distracted phone users in phone booths; 
  kpfleming put his foot down at 1.0 sec. 
  
  Users who found the previous default max delay of 250 msec perfect,
  are welcome to override the new default. Notice that I said that
  250 msec was the default; wait a minute, you might say, the config
  file said it was 500 msec!; well, because of the bug fix for 14515,
  we found that 500 msec was actually enforcing a max of 250. The bug
  fix would restore 500 msec, but we felt even that was a bit tight
  for most users... 2000 msec was pushed earlier by mmichelson, so
  that reduces to 1000 msec after the bug fix. Enjoy!
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@178986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-27 03:45:58 +00:00
Tilghman Lesher 63561aea00 Sound confirmation of call pickup success.
(closes issue #13826)
 Reported by: azielke
 Patches: 
       pickupsound2-trunk.patch uploaded by azielke (license 548)
       __20081124_bug_13826_updated.patch uploaded by lmadsen (license 10)
 Tested by: lmadsen


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@178919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-26 18:41:28 +00:00
Terry Wilson a010aa5ade Remove incorrect line from sample config
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@172581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 21:50:03 +00:00
Terry Wilson 8d782f96b8 Merged revisions 172517 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r172517 | twilson | 2009-01-30 11:47:41 -0600 (Fri, 30 Jan 2009) | 37 lines
  
  Fix feature inheritance with builtin features
  
  When using builtin features like parking and transfers, the AST_FEATURE_* flags
  would not be set correctly for all instances when either performing a builtin
  attended transfer, or parking a call and getting the timeout callback.  Also,
  there was no way on a per-call basis to specify what features someone should
  have on picking up a parked call (since that doesn't involve the Dial() command).
  There was a global option for setting whether or not all users who pickup a
  parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
  AUTOMON, or PARKCALL.
  
  This patch:
  1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
  dialplan or with setvar in channels that support it.  This variable can be set
  to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
  equivalent dial options), to set what features should be activated on this
  channel.  The patch moves the setting of the features datastores into the
  bridging code instead of app_dial to help facilitate this.
  
  2) adds global options parkedcallparking, parkedcallhangup, and
  parkedcallrecording to be similar to the parkedcalltransfers option for
  globally setting features.
  
  3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
  extension since tracking everything through multiple masquerades, etc. is
  difficult and error-prone
  
  4) attempts to fix all cases of return calls from parking and completed builtin
  transfers not having the correct permissions
  (closes issue #14274)
  Reported by: aragon
  Patches: 
        fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
  Tested by: aragon, otherwiseguy
  
  Review http://reviewboard.digium.com/r/138/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@172580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 21:29:12 +00:00
Mark Michelson de90c84b1a After seeing another problem in #asterisk stemming from
the low default value of featuredigittimeout, I decided it
was high time to change it. I have changed the default to
2000 ms based on a suggestion from Leif Madsen.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@152807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 16:38:19 +00:00
Steve Murphy d736ac2b19 Merged revisions 152538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines

A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.

I hope this doesn't spoil some vast, eternal plan...


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@152605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:47:13 +00:00
Brett Bryant ea6f754d4d Update configuration files to add missing options for jingle, gtalk,
manager.conf, and features.conf.

(closes issue #13128)
Reported by: caio1982
Patches:
      missing_options1.diff uploaded by caio1982 (license 22)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-21 21:12:51 +00:00
Jeff Peeler 41fd7a6a21 (closes issue #6113)
Reported by: oej
Tested by: jpeeler

This patch implements multiple parking lots for parked calls. The default parkinglot is used by default, however setting the channel variable PARKINGLOT in the dialplan will allow use of any other configured parkinglot. See configs/features.conf.sample for more details on setting up another non-default parkinglot. Also, one can (currently) set the default parkinglot to use in the driver configuration file via the parkinglot option.

Patch initially written by oej, brought up to date and finalized by mvanbaak, and then stabilized and converted to astobj2 by me.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-21 23:42:45 +00:00
Russell Bryant 31d411d393 Merged revisions 102651 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r102651 | russell | 2008-02-06 09:19:41 -0600 (Wed, 06 Feb 2008) | 3 lines

Clarify setting DYNAMIC_FEATURES so that it gets inherited by outbound channels.
(due to a discussion between me and a user via email)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-06 15:20:31 +00:00
Mark Michelson 6b08c442c7 Adding support for the "automixmonitor" dial and queue options.
This works in much the same way as the automonitor, except that instead of using the monitor
app, it uses the mixmonitor app. By providing an 'x' or 'X' as a dial or queue option, a DTMF
sequence may be entered (as defined in features.conf) to start the one-touch mixmonitor.

This patch also introduces some new API calls to the audiohooks code for searching for an audiohook
by type and for searching for a running audiohook by type.

Big thanks to joetester for writing the initial patch, testing it and patiently waiting for it to 
be committed.

(closes issue #10185, reported and patched by xmarksthespot)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-30 21:19:57 +00:00
Joshua Colp fb9855eba1 Merged revisions 85571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85571 | file | 2007-10-15 13:39:59 -0300 (Mon, 15 Oct 2007) | 4 lines

Document that DTMF based features only work when two channels are bridged together.
(closes issue #10773)
Reported by: pbayley

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-15 16:41:56 +00:00
Russell Bryant 8d0124aba3 Add support for configuring named groups of custom call features in
features.conf.  This allows you to create a feature one time, and then map it
into groups for various different key mappings for the same feature, as well
as easy access control to groups of features.
(patch from bbryant)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 18:21:47 +00:00
Russell Bryant cc35dc8999 Revert changes that snuck in with revision 66724.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 18:09:50 +00:00
Russell Bryant 8ea9dcc221 Fix a crash on reload by using calloc() instead of malloc() to ensure that
data is properly initialized.
(issue #9765, reported by MatsK, patch from eliel)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 14:52:30 +00:00
Russell Bryant 7df63e233c In addition to making it so attended transfers don't fail unnecessarily,
add some new options to control what happens when you hangup on an attended
transfer before the target extension answers the transferred channel.  You
can now have it send the transferee back to the transferer.
(issue #8413, patch from sergee with very minor modifications by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 22:24:51 +00:00
Joshua Colp b8ab0abb83 Allow the user to specify where to enable the respective features for when a parked call is picked up. (ie: transfers and parking)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 18:08:34 +00:00
Joshua Colp ae6898cbe5 Add option to features.conf that enables parking via DTMF on picked up parked calls. (issue #9082 reported by francesco_r)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 17:41:27 +00:00
Joshua Colp 10e3cba61e Add parkedcalltransfers option for res_features. This basically enables/disables DTMF based transfers. If you want to get former behavior you will have to make sure it is enabled.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 17:50:25 +00:00
Olle Johansson 0c3298a573 Update sample config
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-02 13:50:51 +00:00
Tilghman Lesher 091e1aed8d Merged revisions 42716 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42716 | tilghman | 2006-09-11 11:39:06 -0500 (Mon, 11 Sep 2006) | 2 lines

Spelling/grammar fixes (Issue 7929)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 16:41:49 +00:00
Jason Parker 0850bb72ed Kevins last commit made me spot a typo.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-29 21:52:40 +00:00
Kevin P. Fleming ece7018515 add one remaining bit of functionality to the features.conf applicationmap (from Matt Nicholson in Digium Express Services)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-29 21:20:43 +00:00
Russell Bryant 4d7c67fc72 Merge my applicationmap_fixup branch to address the issues described in this
post to the asterisk-dev mailing list:
  http://lists.digium.com/pipermail/asterisk-dev/2006-August/022174.html

This implements full control over both which channel(s) can activate a dynamic
feature, as well as which channel to run the application on.  I also updated
the documentation on the applicationmap in features.conf.sample in hopes that
the configuration is more clear.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-07 04:15:52 +00:00
Kevin P. Fleming 6d0742fc16 merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19 20:44:39 +00:00
Matt O'Gorman 45107ed763 allows for configurable answer timeout on attended transfer
patch 0006763 with minor changes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-23 18:23:05 +00:00
BJ Weschke 5235890be4 This is part 2/2 of the patches for #7090. Adds one-step call parking to /trunk via builtin functions and 'k' 'K' application options added to app_dial. This also resolves #6340.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-22 16:43:43 +00:00
Olle Johansson bf4b484e62 Clarify the need for numeric parking positions (imported from 1.2)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-03 20:45:45 +00:00
Russell Bryant 1abe304427 add a CLI command that allows converting files to other formats using
the Asterisk file format and codec translator modules (issue #6062)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-21 20:45:29 +00:00
Russell Bryant f882197157 Merged revisions 13964 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r13964 | russell | 2006-03-21 13:59:29 -0500 (Tue, 21 Mar 2006) | 3 lines

add a note explaining how to set the DYNAMIC_FEATURES variable to allow the use
of custom features (issue #6747)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-21 19:00:26 +00:00
Matt O'Gorman 06f2040e6f added feature for pausing and unpausing the
monitor app from manager and in the call through
features.conf bug 5395 for the patch


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-14 00:32:30 +00:00
Matt O'Gorman 353e5f1dc9 added small feature from bug 5682 with one typo fix.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-08 00:25:31 +00:00
Josh Roberson 9c8d7286dd Document other use of courtesytone, make association of "One Touch Record" with "Touch monitor"
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-12-09 00:27:11 +00:00
Kevin P. Fleming 2c65582b66 remove extraneous svn:executable properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:24:39 +00:00
Kevin P. Fleming 929d7e6e9b document an undocumented variable
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-03 21:53:44 +00:00
Kevin P. Fleming 9e9f3ace21 add ability to map feature sequences to applications (issue #3764)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-23 02:22:33 +00:00
Mark Spencer 14fba8d8be Add option to park in the next slot (bug #4028)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-04-27 03:58:40 +00:00
Mark Spencer 9f232928dc Various/assundry cleanups
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-05 21:31:40 +00:00
Anthony Minessale II 3092cb538e allow sounds to be configurable
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-05 21:00:20 +00:00
Mark Spencer 526622d6e0 Merge Tony's attended # transfer with changes (bug #3241)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-05 19:56:47 +00:00