Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 0c6ca563001ffeaf12081a26f226bf0cab543b65

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