Merge branch 'stable-3.0.5' into 'master'

Marius Cramer

2014-02-25 230339ed643ed504f42660ca0541f5af85c5a684

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT '';