Re-add merge and block properties.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@371749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Mark Michelson 14 years ago
parent 8a2234472b
commit 50d55266a1

Diff Content Not Available