Merged revisions 282740 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Thu, 19 Aug 2010 02:20:42 +0000 (02:20 +0000)
committerTerry Wilson <twilson@digium.com>
Thu, 19 Aug 2010 02:20:42 +0000 (02:20 +0000)
commit818bedf763ff4e2ec2d7f4fe849924f1f92118cd
treec4b4d2d5dfeddd02faa56775fc62ce8af19f38b8
parent0e5b6069f44b7120ae41523b862fa0023099714b
Merged revisions 282740 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282740 | twilson | 2010-08-18 21:18:50 -0500 (Wed, 18 Aug 2010) | 16 lines

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

  ................
    r282730 | twilson | 2010-08-18 21:14:28 -0500 (Wed, 18 Aug 2010) | 9 lines

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

    ........
      r282729 | twilson | 2010-08-18 21:12:55 -0500 (Wed, 18 Aug 2010) | 2 lines

      Add some documentation about codec negotiation to sip.conf
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/sip.conf.sample