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

Dominik

2015-01-11 01e0759fa0c84fa61fa94ab4ef71e835e6d9ee04

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