Merge "abstract/fixed/adpative jitter buffer: disallow frame re-inserts"
authorJoshua Colp <jcolp@digium.com>
Fri, 20 Jan 2017 19:49:12 +0000 (13:49 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 20 Jan 2017 19:49:12 +0000 (13:49 -0600)

Trivial merge