Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Ca...

Marius Cramer

2014-07-01 dbf29d9979fe779e8801685c0132dbee681e15cf

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