this has been manually merged
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 20 Sep 2006 23:02:25 +0000 (23:02 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 20 Sep 2006 23:02:25 +0000 (23:02 +0000)
commit2e4853780c482ae5de2bbba5a41c800e69d9d1c2
tree7677255d7b0e954ef54e63a19f83543825830494
parentbc36421dd56adfcce901b27be6300b887124635b
this has been manually merged

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