Merge branch 'master' into 'master'

Marius Cramer

2015-09-13 1ec1fc69c4b550b15f3b04d2988e2138a5e22477

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