Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-10-31 1102cc886cf42a23cb3145cd9cc8b0d8f6123b61

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