Merged revisions 336502 via svnmerge from

Merged revisions 336502 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336502 | oej | 2011-09-19 15:38:53 +0200 (Mån, 19 Sep 2011) | 12 lines

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

  ........
    r336501 | oej | 2011-09-19 15:33:50 +0200 (Mån, 19 Sep 2011) | 5 lines

    Add diversion header to a 302 redirect response if we have diversion data

    (closes issue ASTERISK-18143)
    	patch by oej
  ........
................

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