Merge "test_http_media_cache: Fix failing test."
authorzuul <zuul@gerrit.asterisk.org>
Fri, 10 Jun 2016 02:50:05 +0000 (21:50 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 10 Jun 2016 02:50:05 +0000 (21:50 -0500)

Trivial merge