From: Jason Parker <jparker@digium.com>
Date: Tue, 12 Jun 2012 16:15:41 +0000 (+0000)
Subject: Let's try using an automerge-propname, since we have multiple heads.
X-Git-Tag: 10.7.0-digiumphones-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=717f24861274df88d9df85ea96433b332604cbdf;p=thirdparty%2Fasterisk.git

Let's try using an automerge-propname, since we have multiple heads.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@368811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---