Merge "Disable parallel make for easier debugging"
authorMike Marchetti <mmarchetti@sandvine.com>
Fri, 28 Sep 2018 21:36:35 +0000 (23:36 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 28 Sep 2018 21:36:35 +0000 (23:36 +0200)

Trivial merge