Merge "build_system: Prevent goals needing makeopts from running when it's missing"
authorJoshua Colp <jcolp@digium.com>
Fri, 29 Jan 2016 14:06:22 +0000 (08:06 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 29 Jan 2016 14:06:22 +0000 (08:06 -0600)

Trivial merge