Merged revisions 329952 via svnmerge from
authorSean Bright <sean@malleable.com>
Thu, 28 Jul 2011 13:04:33 +0000 (13:04 +0000)
committerSean Bright <sean@malleable.com>
Thu, 28 Jul 2011 13:04:33 +0000 (13:04 +0000)
commitf90bb00e29ebd8ca2267254b1812e3881cc28077
treefc0c7c2e161d09f171f78a49e602591d70cb0970
parentd4e239fa603c7521c76dc83e2e3a4379caaafb8f
Merged revisions 329952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329952 | seanbright | 2011-07-28 09:03:58 -0400 (Thu, 28 Jul 2011) | 4 lines

  The default conf-usermenu says that '8' can be used to leave the conference, so
  put that in the sample user menu.  '5' is supposed to extend the conference, but
  there doesn't appear to be a concept of that in the menu actions.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/confbridge.conf.sample