]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "pbx.c: Prevent infinite recursion in manager_show_dialplan_helper." into 11
authorJoshua Colp <jcolp@digium.com>
Mon, 29 Aug 2016 19:57:53 +0000 (14:57 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 29 Aug 2016 19:57:53 +0000 (14:57 -0500)

Trivial merge