]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_sdp_rtp: Fix multiple keepalive scheduled items." into 13
authorMatt Jordan <mjordan@digium.com>
Sat, 29 Aug 2015 17:30:50 +0000 (12:30 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 29 Aug 2015 17:30:50 +0000 (12:30 -0500)

Trivial merge