Merge branch 'patch/gitignore' of github.com:asterisk/pjproject
Merge branch 'patch/libm' of github.com:asterisk/pjproject
Merge branch 'patch/fix-warnings' of github.com:asterisk/pjproject
Merge branch 'patch/cross-compile-ar' of github.com:asterisk/pjproject
Merge branch 'patch/parallel-build' of github.com:asterisk/pjproject
Merge branch 'patch/shared-libraries' of github.com:asterisk/pjproject

Conflicts:
	aconfigure
	build/rules.mak
Merge branch 'patch/external-srtp' of github.com:asterisk/pjproject

Conflicts:
	build.mak.in