Merged revisions 7523 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 19 Dec 2005 19:08:42 +0000 (19:08 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 19 Dec 2005 19:08:42 +0000 (19:08 +0000)
commit154d9ada809f8edf2beb167c1dfd6516c47294a9
tree7314db851117146d6c0d9eb1f2d59fda945a5a79
parent9b166d3319a3832797eff24970cc758de10c1c65
Merged revisions 7523 via svnmerge from
/branches/1.2

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