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

Marius Cramer

2014-04-04 36420c614b259a0ca1aa7db14b1215db60c4c5ce

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