Merged revisions 369793 via svnmerge from

Merged revisions 369793 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r369793 | jrose | 2012-07-09 09:43:49 -0500 (Mon, 09 Jul 2012) | 9 lines

  chan_sip: Fix small behavioral change accidentally introduced in r369750

  When removing the warning for AST_CONTROL_FLASH from sip_indicate, I also
  inadvertently changed the return value, which would likely make the indication
  not be sent in audio. This fixes that while still removing the warning message.
  ........

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

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