Merged revisions 297909 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 8 Dec 2010 18:08:27 +0000 (18:08 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 8 Dec 2010 18:08:27 +0000 (18:08 +0000)
commitd01027ae49a161405e559dad91d7a701c30bde5f
treee6c2e68cd2e3eccef6f15af117dea3d0115cfcb9
parenta62958eee90f9d1de250bd080154aecc3b824779
Merged revisions 297909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297909 | tilghman | 2010-12-08 12:06:04 -0600 (Wed, 08 Dec 2010) | 11 lines

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

  ........
    r297908 | tilghman | 2010-12-08 12:04:38 -0600 (Wed, 08 Dec 2010) | 4 lines

    Use inheritance to get correct results for SIPFROMDOMAIN.

    (from an internal Digium discussion)
  ........
................

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