Merge remote-tracking branch 'renky/master_fixes'

Marius Cramer

2014-04-10 7e886ae640ca6b38b332f139427d69ae50cca352

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