From: zuul <zuul@gerrit.asterisk.org>
Date: Wed, 14 Sep 2016 20:03:48 +0000 (-0500)
Subject: Merge "sip_to_pjsip.py: Map legacy_useroption_parsing." into 14
X-Git-Tag: 14.1.0-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a085874d59b1cdb366d2d2bb1d20bfd87bd0cff3;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip.py: Map legacy_useroption_parsing." into 14
---

a085874d59b1cdb366d2d2bb1d20bfd87bd0cff3