Merge "Build System: Disable parallel make in the root Makefile."
authorJoshua Colp <jcolp@digium.com>
Mon, 13 Nov 2017 13:47:38 +0000 (07:47 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 13 Nov 2017 13:47:38 +0000 (07:47 -0600)

Trivial merge