Merge "res_pjsip_log_forwarder.c: Add CLI "pjsip show buildopts"."
authorMark Michelson <mmichelson@digium.com>
Wed, 13 Jan 2016 15:48:57 +0000 (09:48 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 13 Jan 2016 15:48:58 +0000 (09:48 -0600)

Trivial merge