Merge branch 'master' into 'master'

Marius Cramer

2014-09-29 178258f86cdf00b9c047023b97937c794bac88ec

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