From: Joshua Colp <jcolp@digium.com>
Date: Fri, 24 Jul 2015 15:42:56 +0000 (-0500)
Subject: Merge "res_pjsip: Add rtp_keepalive to sample config file." into 13
X-Git-Tag: 13.5.0-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1997b6f677f314f685ece102af9a70ed17fe63b5;p=thirdparty%2Fasterisk.git

Merge "res_pjsip: Add rtp_keepalive to sample config file." into 13
---

1997b6f677f314f685ece102af9a70ed17fe63b5