Fix merge properties to reflect Asterisk 10 branch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329105 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
6c19532b04
commit
1e1f6e6192