From: Joshua Colp <jcolp@digium.com>
Date: Mon, 20 Jul 2015 20:52:38 +0000 (-0500)
Subject: Merge "res_pjsip: Add rtp_keepalive endpoint option."
X-Git-Tag: 14.0.0-beta1~786
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7f3ae1815d30a7861dd1d6013996f6d82c32431;p=thirdparty%2Fasterisk.git

Merge "res_pjsip: Add rtp_keepalive endpoint option."
---

f7f3ae1815d30a7861dd1d6013996f6d82c32431