Merge branch 'master' into 'master'

Marius Cramer

2014-01-28 c1bef897ed1abaf9c5730b339d6de3d950d2f980

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