Fix merge 10 branch merge properties.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-08-22 19:52:30 +00:00
parent 3b53a9cdb3
commit 4110af6976

Diff Content Not Available