Merge "rtp_engine.c: Must protect mime_types_len with mime_types_lock."
authorJoshua Colp <jcolp@digium.com>
Thu, 6 Aug 2015 17:25:07 +0000 (12:25 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 6 Aug 2015 17:25:08 +0000 (12:25 -0500)

Trivial merge