Multiple revisions 397975-397976

........
  r397975 | rmudgett | 2013-08-29 20:00:00 -0500 (Thu, 29 Aug 2013) | 1 line
  
  pbx.c: Make ast_str_substitute_variables_full() not mask variables.
........
  r397976 | rmudgett | 2013-08-29 20:00:41 -0500 (Thu, 29 Aug 2013) | 1 line
  
  Revert last commit.
........

Merged revisions 397975-397976 from http://svn.asterisk.org/svn/asterisk/branches/12


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