]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip: Add rtp_keepalive endpoint option." into certified/13.1
authorJoshua Colp <jcolp@digium.com>
Mon, 20 Jul 2015 20:52:09 +0000 (15:52 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 20 Jul 2015 20:52:09 +0000 (15:52 -0500)

Trivial merge