Merge branch 'stable-3.0.5'

Marius Cramer

2015-05-21 985390fdb8ba94cbcf7312e32a484396c3d49702

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