Merge branch 'master' into 'master'

Marius Cramer

2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e

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