Merge "core/pbx: dialplan show - display filename/line#"
authorzuul <zuul@gerrit.asterisk.org>
Thu, 5 Jan 2017 16:30:32 +0000 (10:30 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 5 Jan 2017 16:30:32 +0000 (10:30 -0600)

Trivial merge