Merged revisions 302314 via svnmerge from

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

................
  r302314 | mnicholson | 2011-01-18 15:43:21 -0600 (Tue, 18 Jan 2011) | 18 lines

  Merged revisions 302313 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r302313 | mnicholson | 2011-01-18 15:40:03 -0600 (Tue, 18 Jan 2011) | 11 lines

    Merged revisions 302311 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r302311 | mnicholson | 2011-01-18 15:35:03 -0600 (Tue, 18 Jan 2011) | 4 lines

      URI encode the user part of the contact header.

      ABE-2705
    ........
  ................
................

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