Merged revisions 57144 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 28 Feb 2007 19:57:41 +0000 (19:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 28 Feb 2007 19:57:41 +0000 (19:57 +0000)
commit69b0eb24edf64af7aaadd9e8655b8e0c485a5b01
tree12edd5466caa43fdea4b6d6ebffc84f8200fec83
parent462f759e6792beba082dbcd2a543b44825e805c2
Merged revisions 57144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57144 | russell | 2007-02-28 13:56:20 -0600 (Wed, 28 Feb 2007) | 6 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Add support for the "barge=no" option for trunks.  If this option is set,
  then stations will not be able to join in on a call that is on progress
  on this trunk.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c
configs/sla.conf.sample