Merge branch 'stable-3.0.5'

Marius Cramer

2015-12-08 2dffea3c8168906d0f6b0d8856faa85bb213c424

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