Merge "AOC: Fix AOC-S json memory leak."
authorJoshua Colp <jcolp@digium.com>
Mon, 6 Nov 2017 13:51:36 +0000 (07:51 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 6 Nov 2017 13:51:36 +0000 (07:51 -0600)

Trivial merge