Merge "bundled pjproject: Crashes while resolving DNS names."
authorzuul <zuul@gerrit.asterisk.org>
Mon, 31 Oct 2016 17:44:45 +0000 (12:44 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 31 Oct 2016 17:44:45 +0000 (12:44 -0500)

Trivial merge