Merged revisions 377229 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r377229 | rmudgett | 2012-12-04 19:11:26 -0600 (Tue, 04 Dec 2012) | 31 lines
  
  confbridge: Fix several small issues.
  
  * Made func_confbridge_helper() allow an empty value when setting options.
  You previously could not Set(CONFBRIDGE(user,pin)=) and clear the
  configured pin from the dialplan.
  
  * Made func_confbridge_helper() handle its datastore better if multiple
  threads attempt to set the first CONFBRIDGE option value on the channel.
  
  * Made the func_confbridge_helper() only output one diagnostic message
  concerning the option.
  
  * Made the bridge video_mode able to repeatedly change in the config file
  and CONFBRIDGE dialplan function.  The video_mode option values are an
  enum and not independent of each other.
  
  * Made handle_cli_confbridge_show_bridge_profile() better handle the
  video_mode option.
  
  * Simplified datastore handling code in conf_find_user_profile() and
  conf_find_bridge_profile().
  
  (closes issue ASTERISK-20655)
  Reported by: Birger "WIMPy" Harzenetter
  ........
  
  Merged revisions 377227 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 377228 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377235 65c4cc65-6c06-0410-ace0-fbb531ad65f3