Merge "res_pjsip: Add rtp_keepalive to sample config file."
authorJoshua Colp <jcolp@digium.com>
Fri, 24 Jul 2015 15:43:08 +0000 (10:43 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 24 Jul 2015 15:43:08 +0000 (10:43 -0500)

Trivial merge