configure trunk for merging fixes from 1.2 branch
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 1 Dec 2005 19:18:18 +0000 (19:18 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 1 Dec 2005 19:18:18 +0000 (19:18 +0000)
commit0b6dd5c5a8cbd4b530d35b100201366b60ea3219
tree2b58fb1fe93ad150a68fe1bdd879300db317de5e
parent39c7f262a05d26d374052f6570a2de2a6fb82c99
configure trunk for merging fixes from 1.2 branch

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