rename merge property

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@307 2fbb986a-6c06-0410-b554-c9c1f0a7f128
remotes/origin/1.4
Kevin P. Fleming 19 years ago
parent 681a5f582e
commit 6f831daaed

Diff Content Not Available