Merge "res_sorcery_memory_cache: Implement expire_on_reload option."
authorMatt Jordan <mjordan@digium.com>
Fri, 5 Jun 2015 23:04:17 +0000 (18:04 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 5 Jun 2015 23:04:17 +0000 (18:04 -0500)

Trivial merge