merge
[xtuple] / node-datasource / .gitmodules