Merge branch 'master' into 'master'

Marius Cramer

2014-02-11 e2b4f760bb91caf66445a888c7a185e972e97a3c

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