Merge "pjproject_bundled: Update for pjproject 2.6"
authorJoshua Colp <jcolp@digium.com>
Fri, 24 Feb 2017 18:49:07 +0000 (12:49 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 24 Feb 2017 18:49:07 +0000 (12:49 -0600)

Trivial merge