Guillaume J. Charmes fcd3746eaa Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit ...

merge existing config when committing
Upstream-commit: db1afee3f023957adf43a4e9a565568e11e81d2d
Component: engine

2014-03-12 17:49:11 -07:00

..

engine

Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit

2014-03-12 17:49:11 -07:00