Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Marius Cramer

2014-05-05 c9d4ef4e593bde5a12d3eaa19b44ea5829866004

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