Merge "res_srtp: Enable AES-256 and AES-GCM." into 14

author Joshua Colp <jcolp@digium.com>

Fri, 22 Jul 2016 16:50:59 +0000 (11:50 -0500)

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

Fri, 22 Jul 2016 16:50:59 +0000 (11:50 -0500)
author Joshua Colp <jcolp@digium.com>
Fri, 22 Jul 2016 16:50:59 +0000 (11:50 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 Jul 2016 16:50:59 +0000 (11:50 -0500)
diff --cc channels/chan_sip.c
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc include/asterisk/autoconfig.h.in
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Fri, 22 Jul 2016 16:50:59 +0000 (11:50 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 22 Jul 2016 16:50:59 +0000 (11:50 -0500)
		1	2
channels/chan_sip.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/asterisk/autoconfig.h.in	patch \|	diff1 \|	diff2 \|	blob \| history