]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Re-add merge and block properties.
authorMark Michelson <mmichelson@digium.com>
Mon, 27 Aug 2012 17:49:57 +0000 (17:49 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 27 Aug 2012 17:49:57 +0000 (17:49 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@371749 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found