Commit 9e0a173bf553919fad4662c131187971864f4fab

Authored by 175930106
2 parents 4a90be5f 787db120

Merge remote-tracking branch 'origin/master'

config/marketConfig/test_config_hg renamed to config/marketConfig/test_config_hg.conf