Merged revisions 57203 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 28 Feb 2007 22:09:33 +0000 (22:09 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 28 Feb 2007 22:09:33 +0000 (22:09 +0000)
commit9c58ead89baf3e0ac4dacf8a9865bd3549f31843
tree1d4ec1a4366a55d84e4cb608949d75caf8a3096e
parente7b03a991ef101074af2b29fea568a3df7e9fa3b
Merged revisions 57203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57203 | russell | 2007-02-28 16:07:05 -0600 (Wed, 28 Feb 2007) | 7 lines

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

* Add support for private hold.  By setting "hold=private" for a trunk, only
  the station that put the call on hold will be able to retrieve it from hold.
  Also, by setting "hold=private" for a station, any call that station puts
  on hold can only be retrieved by that station.

........

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