Merge changes from team/russell/sla_trunk_moh ...
authorRussell Bryant <russell@russellbryant.com>
Wed, 21 Nov 2007 00:21:38 +0000 (00:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 21 Nov 2007 00:21:38 +0000 (00:21 +0000)
commit6335b4b30d81ccd974040e27a1058080281b8e52
tree1b8556578d01fd800141253ac15bf7a1d472e3d7
parent49b022aee24c50e6661a2f08ee566675c404c4d1
Merge changes from team/russell/sla_trunk_moh ...

* Added the ability to specify the music on hold class used to play into the
   conference when there is only one member and the M option is used.
* Added the ability to specify a music on hold class to play instead of ringing
   for the SLATrunk application.

(patched by me, and tested internally)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES
apps/app_meetme.c