Merge branch 'master' into 'master'

Marius Cramer

2015-03-01 e2e00df25e5561131b5b50d332f0de712b4244c7

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