Merged revisions 7831 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 6 Jan 2006 00:36:12 +0000 (00:36 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 6 Jan 2006 00:36:12 +0000 (00:36 +0000)
commita84633ba26f6d391eea50986b23cce34458efeaa
treef22eba28ded22f7bdfd0d40af4780c6f6466b84d
parent95b4988cf5f17ea2360fcc0c4b818266e3ada49b
Merged revisions 7831 via svnmerge from
/branches/1.2

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