Merge "CHAOS: res_pjsip_diversion avoid crash if allocation fails"
authorMatt Jordan <mjordan@digium.com>
Sat, 19 Sep 2015 14:15:21 +0000 (09:15 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 19 Sep 2015 14:15:22 +0000 (09:15 -0500)

Trivial merge