set 1.10 merge properties
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328076 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
542b2133ca
commit
96d6735f65