Merge branch 'master' into 'master'

Marius Cramer

2015-09-12 6cdb029df901248cf6f9bbd74586cc6f62051fee

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