Merged revisions 372621,372625,372629 via svnmerge from

Merged revisions 372621,372625,372629 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r372621 | rmudgett | 2012-09-07 16:24:39 -0500 (Fri, 07 Sep 2012) | 18 lines

  Fix VoicemailUserEntry event headers ServerEmail and MailCommand reported values.

  The AMI action VoicemailUsersList VoicemailUserEntry event headers
  ServerEmail and MailCommand did not report the global values if they were
  not overridden.  The VoicemailUserEntry event header ServerEmail was not
  populated with the global value if the voicemail user did not override it.
  The VoicemailUserEntry event header MailCommand was never populated with a
  value.

  * Removed unused struct ast_vm_user member mailcmd[].

  (closes issue AST-973)
  Reported by: John Bigelow
  Tested by: rmudgett
  ........

  Merged revisions 372620 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372625 | rmudgett | 2012-09-07 16:49:16 -0500 (Fri, 07 Sep 2012) | 10 lines

  Fix exception path typo in app_queue.c try_calling().

  (closes issue ASTERISK-20380)
  Reported by: Jeremy Pepper
  Patches:
        fix-local-channel-locking.patch (license #6350) patch uploaded by Jeremy Pepper
  ........

  Merged revisions 372624 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372629 | rmudgett | 2012-09-07 17:07:59 -0500 (Fri, 07 Sep 2012) | 8 lines

  Remove annoying unconditional debug message from INC/DEC functions.

  (closes issue AST-1001)
  Reported by: Guenther Kelleter
  ........

  Merged revisions 372628 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@372654 65c4cc65-6c06-0410-ace0-fbb531ad65f3