Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

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