Merge branch 'master' into 'master'

Marius Cramer

2015-06-27 3ba59d59a2ad4068d78753635531b7625c916258

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