Merge branch 'master' into 'master'

Marius Cramer

2015-01-21 c0138f5488dc19898c9e6c2df6c6264ee618e77c

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