Merge "res_pjsip_pubsub: Prune subs with reliable transports at startup" into 15

author George Joseph <gjoseph@digium.com>

Thu, 1 Feb 2018 17:21:13 +0000 (11:21 -0600)

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

Thu, 1 Feb 2018 17:21:13 +0000 (11:21 -0600)
author George Joseph <gjoseph@digium.com>
Thu, 1 Feb 2018 17:21:13 +0000 (11:21 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 1 Feb 2018 17:21:13 +0000 (11:21 -0600)
diff --cc CHANGES
Simple merge
diff --cc res/res_pjsip_registrar.c
Simple merge
author	George Joseph <gjoseph@digium.com>
	Thu, 1 Feb 2018 17:21:13 +0000 (11:21 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 1 Feb 2018 17:21:13 +0000 (11:21 -0600)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip_registrar.c	patch \|	diff1 \|	diff2 \|	blob \| history