From: David Vossel <dvossel@digium.com>
Date: Fri, 6 Nov 2009 17:25:34 +0000 (+0000)
Subject: Blocked revisions 228441 via svnmerge
X-Git-Tag: 1.6.0.18-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6acb995aa0d1b426dbfeede8bf1e5c7cbac14e7;p=thirdparty%2Fasterisk.git

Blocked revisions 228441 via svnmerge

........
  r228441 | dvossel | 2009-11-06 11:22:31 -0600 (Fri, 06 Nov 2009) | 3 lines

  Fixes merging issue from 1.4, frame data is held in data.ptr in trunk
........


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