Merge branch 'stable-3.0.5'

Marius Cramer

2014-10-24 5ec4395f0e23bf11b3edef5c745e8f38c73ce637

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