]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix merge props
authorJason Parker <jparker@digium.com>
Mon, 3 May 2010 17:49:52 +0000 (17:49 +0000)
committerJason Parker <jparker@digium.com>
Mon, 3 May 2010 17:49:52 +0000 (17:49 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260745 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found