From f1d27e35bffa45acd240e6d1fe644875441bca2f Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 13 Apr 2012 16:01:09 +0000
Subject: [PATCH] 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