From: Jason Parker <jparker@digium.com>
Date: Tue, 12 Jun 2012 16:22:14 +0000 (+0000)
Subject: Let's fix the 1.8-merged prop, to give automerge the best chance at succeeding.
X-Git-Tag: 10.7.0-digiumphones-rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bef8ed1e38146dc94a95a4dbef0edd6acd56c77;p=thirdparty%2Fasterisk.git

Let's fix the 1.8-merged prop, to give automerge the best chance at succeeding.

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