From: Matthew Nicholson <mnicholson@digium.com>
Date: Thu, 9 Jun 2011 15:37:50 +0000 (+0000)
Subject: Blocked revisions 322657,322698 via svnmerge
X-Git-Tag: 1.6.2.19-rc1~3^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cd1c16b11bc41a635db0be2e1742427674b4eb7;p=thirdparty%2Fasterisk.git

Blocked revisions 322657,322698 via svnmerge

........
  r322657 | mnicholson | 2011-06-09 10:20:19 -0500 (Thu, 09 Jun 2011) | 2 lines

  whitespace
........
  r322698 | mnicholson | 2011-06-09 10:36:05 -0500 (Thu, 09 Jun 2011) | 2 lines

  unlock pvt when we drop voice frames received in early media when in t.38 mode
........


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