From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 8 Aug 2014 01:37:05 +0000 (+0000)
Subject: Initialize svnmerge from branches/13
X-Git-Tag: 14.0.0-beta1~1781
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96be6b2228e250497e7b78cd4c3081aaf070ce1d;p=thirdparty%2Fasterisk.git

Initialize svnmerge from branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420499 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---