summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-09-20 23:02:25 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-09-20 23:02:25 +0000
commit2e4853780c482ae5de2bbba5a41c800e69d9d1c2 (patch)
tree7677255d7b0e954ef54e63a19f83543825830494
parentbc36421dd56adfcce901b27be6300b887124635b (diff)
this has been manually merged
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
0 files changed, 0 insertions, 0 deletions