Merge "sip_to_pjsip.py: Map legacy_useroption_parsing."
authorzuul <zuul@gerrit.asterisk.org>
Wed, 14 Sep 2016 20:03:46 +0000 (15:03 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 14 Sep 2016 20:03:46 +0000 (15:03 -0500)

Trivial merge