Merge "format_ogg_opus: New format"
authorGeorge Joseph <gjoseph@digium.com>
Tue, 27 Sep 2016 19:12:42 +0000 (14:12 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 27 Sep 2016 19:12:42 +0000 (14:12 -0500)

Trivial merge