Merged revisions 216264 via svnmerge from

Merged revisions 216264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r216264 | russell | 2009-09-04 05:48:44 -0500 (Fri, 04 Sep 2009) | 16 lines

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

  ................
    r216263 | russell | 2009-09-04 05:48:00 -0500 (Fri, 04 Sep 2009) | 9 lines

    Merged revisions 216262 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.2

    ........
      r216262 | russell | 2009-09-04 05:47:37 -0500 (Fri, 04 Sep 2009) | 2 lines

      Add a plain text version of the IAX2 security document.
    ........
  ................
................

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