From f2fe72628e196ade288bc2c3b91d3bd7c56bdfeb Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 19 Sep 2011 19:00:16 +0000
Subject: [PATCH] Update merge 10 branch merge propterty.

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