Merge "pjproject_bundled: Improve reliability of pjproject download" into 13

author Joshua Colp <jcolp@digium.com>

Mon, 21 Nov 2016 12:23:58 +0000 (06:23 -0600)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Mon, 21 Nov 2016 12:23:58 +0000 (06:23 -0600)
author Joshua Colp <jcolp@digium.com>
Mon, 21 Nov 2016 12:23:58 +0000 (06:23 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 21 Nov 2016 12:23:58 +0000 (06:23 -0600)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc third-party/pjproject/Makefile
Simple merge
diff --cc third-party/pjproject/configure.m4
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 21 Nov 2016 12:23:58 +0000 (06:23 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 21 Nov 2016 12:23:58 +0000 (06:23 -0600)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
third-party/pjproject/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
third-party/pjproject/configure.m4	patch \|	diff1 \|	diff2 \|	blob \| history