Merged revisions 333339 via svnmerge from

Merged revisions 333339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r333339 | mjordan | 2011-08-26 08:36:36 -0500 (Fri, 26 Aug 2011) | 20 lines

  Bug fixes for voicemail user emailsubject / emailbody.

  This code change fixes a few issues with the voicemail user override of
  emailbody and emailsubject, including escaping the strings, potential memory
  leaks, and not overriding the voicemail defaults.  Revision 325877 fixed this
  for ASTERISK-16795, but did not fix it for ASTERISK-16781.  A subsequent
  check-in prevented 325877 from being applied to 10.  This check-in resolves
  both issues, and applies the changes to 1.8, 10, and trunk.

  (closes issue ASTERISK-16781)
  Reported by: Sebastien Couture
  Tested by: mjordan

  (closes issue ASTERISK-16795)
  Reported by: mdeneen
  Tested by: mjordan

  Review: https://reviewboard.asterisk.org/r/1374
........

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