Merge "pbx.c: Additional fixes to ast_context_remove_extension_callerid2."
authorJoshua Colp <jcolp@digium.com>
Tue, 16 Aug 2016 10:32:30 +0000 (05:32 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 16 Aug 2016 10:32:30 +0000 (05:32 -0500)

Trivial merge