Merge "core / pjsip: Add support for grouping streams together."
authorJoshua Colp <jcolp@digium.com>
Tue, 31 Oct 2017 18:27:40 +0000 (13:27 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 31 Oct 2017 18:27:40 +0000 (13:27 -0500)

Trivial merge