Merge "channel: Fix issues in hangup scenarios caused by frame deferral" into 14

author Joshua Colp <jcolp@digium.com>

Wed, 16 Nov 2016 22:55:39 +0000 (16:55 -0600)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Wed, 16 Nov 2016 22:55:39 +0000 (16:55 -0600)
author Joshua Colp <jcolp@digium.com>
Wed, 16 Nov 2016 22:55:39 +0000 (16:55 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 Nov 2016 22:55:39 +0000 (16:55 -0600)
diff --cc include/asterisk/channel.h
Simple merge
diff --cc main/channel.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 16 Nov 2016 22:55:39 +0000 (16:55 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 16 Nov 2016 22:55:39 +0000 (16:55 -0600)
		1	2
include/asterisk/channel.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/channel.c	patch \|	diff1 \|	diff2 \|	blob \| history