Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Marius Burkard

2016-06-22 b542800232a61cc9fd82d39c54bc44468af30ce0

1
2
ALTER TABLE `sys_config` DROP `config_id`,
    ADD PRIMARY KEY (`group`, `name`);