From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 13 Apr 2012 16:01:09 +0000 (+0000)
Subject: Update properties on 1.8-digiumphones
X-Git-Tag: certified/1.8.11-cert1~3^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d27e35bffa45acd240e6d1fe644875441bca2f;p=thirdparty%2Fasterisk.git

Update properties on 1.8-digiumphones

Change the merge property tag from svnmerge-integrated to branches-1.8-merged.
Added merged revisions from r362042.


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