Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59

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