Merge branch 'master' into 'master'

Marius Cramer

2015-08-17 363cb9591d68e99169ff6d6a29f2e29daf16cd13

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