From: Joshua Colp <jcolp@digium.com>
Date: Mon, 7 Nov 2016 16:40:14 +0000 (-0600)
Subject: Merge "pjproject_bundled:  Fix issue with libasteriskpj needing libresample"
X-Git-Tag: 15.0.0-beta1~539
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15665daf4654121f805b6faab2ae4d89b49d76b6;p=thirdparty%2Fasterisk.git

Merge "pjproject_bundled:  Fix issue with libasteriskpj needing libresample"
---

15665daf4654121f805b6faab2ae4d89b49d76b6