Merge branch 'master' into 'master'

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

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