From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 1 Nov 2013 17:32:07 +0000 (+0000)
Subject: SVN properties: Add svnmerge properties for 11
X-Git-Tag: certified/11.6-cert1-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2788f6a6001bd2910b33acb02258cb6f5c4ff164;p=thirdparty%2Fasterisk.git

SVN properties: Add svnmerge properties for 11

git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/11.6@402377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---