From: Joshua Colp <jcolp@digium.com>
Date: Tue, 8 Nov 2016 19:27:20 +0000 (-0600)
Subject: Merge changes from topic 'ASTERISK-26343' into 14
X-Git-Tag: 14.2.0-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b3f6eb1066affe27cb2315ffd31ce010897fad;p=thirdparty%2Fasterisk.git

Merge changes from topic 'ASTERISK-26343' into 14

* changes:
  channel: Use frame deferral API for safe sleep.
  autoservice: Use frame deferral API
  AGI: Only defer frames when in an interception routine.
  Add API for channel frame deferral.
---

c2b3f6eb1066affe27cb2315ffd31ce010897fad