]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_log_forwarder.c: Add CLI "pjsip show buildopts"." into 13
authorMark Michelson <mmichelson@digium.com>
Wed, 13 Jan 2016 15:48:54 +0000 (09:48 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 13 Jan 2016 15:48:54 +0000 (09:48 -0600)

Trivial merge