Merge "pjproject_bundled: Various fixes discovered during testing of OSes"
authorzuul <zuul@gerrit.asterisk.org>
Wed, 4 May 2016 00:11:18 +0000 (19:11 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 4 May 2016 00:11:18 +0000 (19:11 -0500)

Trivial merge