From: David M. Lee <dlee@digium.com>
Date: Fri, 16 Nov 2012 00:14:00 +0000 (+0000)
Subject: Somehow I put in svn-1.6 merge information. Oops.
X-Git-Tag: 13.0.0-beta1~2353
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=00736a5e5d2cce93c77a4314ee031d2580f9cdc3;p=thirdparty%2Fasterisk.git

Somehow I put in svn-1.6 merge information. Oops.

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