Fixed svn merge property breakage from r377986
authorDavid M. Lee <dlee@digium.com>
Thu, 13 Dec 2012 21:15:44 +0000 (21:15 +0000)
committerDavid M. Lee <dlee@digium.com>
Thu, 13 Dec 2012 21:15:44 +0000 (21:15 +0000)
commit0f62fa6e476b0d8f64df03f21df359cb7bab6d3e
treeafea01842916cd238064ff12038c29ef350ac2f6
parent758cad098447b79b0da70631f562ffa9fd75dbd9
Fixed svn merge property breakage from r377986

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377994 65c4cc65-6c06-0410-ace0-fbb531ad65f3