Merge "res_pjsip: Add option to force G.726 to be treated as AAL2 packed."
authorJoshua Colp <jcolp@digium.com>
Tue, 16 Jun 2015 12:51:30 +0000 (07:51 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 16 Jun 2015 12:51:30 +0000 (07:51 -0500)

Trivial merge