Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 22efd48fd42104a2526eef58cad543d4abbb83b5

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