Merge branch 'master' into 'master'

Marius Cramer

2015-09-03 57963434331b48627cc2a0bfcff3924b0112995e

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