Merge branch 'master' into 'master'

Marius Cramer

2015-06-02 6f2d95f4f36043e38b14599f5878af320566f8f4

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