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

Florian Schaal

2014-12-06 5e3aadc044ac6b55fb6b247287f886f60cb71733

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