Merge "Revert "channel: Use frame deferral API for safe sleep.""
authorGeorge Joseph <gjoseph@digium.com>
Thu, 10 Nov 2016 13:34:35 +0000 (07:34 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 10 Nov 2016 13:34:35 +0000 (07:34 -0600)

Trivial merge