Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf

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