Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

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