Merge branch 'master' into 'master'

Marius Cramer

2015-03-09 e564b4796a4256a67328e117c9675ccae7d872cd

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