Merge branch 'master' into 'master'

Marius Cramer

2014-06-05 4a569d979c0e5d39b7ac9cb72a02e7ac2e906962

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