From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 7 Aug 2008 01:32:10 +0000 (+0000)
Subject: Blocked revisions 136348 via svnmerge
X-Git-Tag: 1.6.2.0-beta1~1488
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d0a4e7bfac6cb90ac6112a5f93a56ebaa719a7e;p=thirdparty%2Fasterisk.git

Blocked revisions 136348 via svnmerge

........
r136348 | tilghman | 2008-08-06 20:31:27 -0500 (Wed, 06 Aug 2008) | 3 lines

Also, parse useincomingcalleridonzaptransfer (and add appropriate deprecation
warnings).

........


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