From 6f831daaed695b9c1c31069805ff354c8d355073 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Mon, 13 Feb 2006 23:07:11 +0000
Subject: [PATCH] rename merge property

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@307 2fbb986a-6c06-0410-b554-c9c1f0a7f128