Merge branch 'master' into 'master'

Marius Cramer

2015-05-07 f6e42fc631acad20006ad79f63ccecc0a86ad0eb

1
ALTER TABLE  `sys_session` CHANGE  `session_id`  `session_id` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;